Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit b8bf460

Browse files
committed
Rename NETSTANDARD->NETSTANDARD1_1 according to MS specifications
1 parent cac94ce commit b8bf460

File tree

14 files changed

+103
-103
lines changed

14 files changed

+103
-103
lines changed

src/ServiceStack.Text.NetCore/ServiceStack.Text/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"configurations": {
33
"Debug": {
44
"buildOptions": {
5-
"define": ["NETSTANDARD", "DEBUG", "TRACE"]
5+
"define": ["DEBUG", "TRACE"]
66
}
77
},
88
"Release": {
99
"buildOptions": {
10-
"define": ["NETSTANDARD", "TRACE"],
10+
"define": ["TRACE"],
1111
"optimize": true
1212
}
1313
}

src/ServiceStack.Text/AutoMappingUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private static object ChangeValueType(object from, Type type)
103103
public static object ChangeTo(this string strValue, Type type)
104104
{
105105
if (type.IsValueType() && !type.IsEnum()
106-
#if !(PCL || NETSTANDARD)
106+
#if !(PCL || NETSTANDARD1_1)
107107
&& type.HasInterface(typeof(IConvertible))
108108
#endif
109109
)

src/ServiceStack.Text/DynamicProxy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static string ProxyName(Type targetType)
3636
static DynamicProxy()
3737
{
3838
var assemblyName = new AssemblyName("DynImpl");
39-
#if NETSTANDARD
39+
#if NETSTANDARD1_1
4040
DynamicAssembly = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
4141
#else
4242
DynamicAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
@@ -60,7 +60,7 @@ static Type GetConstructedType(Type targetType)
6060
foreach (var face in targetType.GetTypeInterfaces())
6161
IncludeType(face, typeBuilder);
6262

63-
#if NETSTANDARD
63+
#if NETSTANDARD1_1
6464
return typeBuilder.CreateTypeInfo().AsType();
6565
#else
6666
return typeBuilder.CreateType();
@@ -104,7 +104,7 @@ static void BindMethod(TypeBuilder typeBuilder, MethodInfo methodInfo)
104104
{
105105
if (methodInfo.ReturnType.IsValueType() || methodInfo.ReturnType.IsEnum())
106106
{
107-
#if NETSTANDARD
107+
#if NETSTANDARD1_1
108108
MethodInfo getMethod = typeof(Activator).GetMethod("CreateInstance");
109109
#else
110110
MethodInfo getMethod = typeof(Activator).GetMethod("CreateInstance",

src/ServiceStack.Text/Env.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static Env()
3636
IsWindowsStore = true;
3737
}
3838

39-
#if PCL || NETSTANDARD
39+
#if PCL || NETSTANDARD1_1
4040
IsUnix = IsMono;
4141
#else
4242
var platform = (int)Environment.OSVersion.Platform;

src/ServiceStack.Text/HttpUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ public static string GetResponseBody(this Exception ex)
853853
{
854854
var webEx = ex as WebException;
855855
if (webEx == null || webEx.Response == null
856-
#if !(SL5 || PCL || NETSTANDARD)
856+
#if !(SL5 || PCL || NETSTANDARD1_1)
857857
|| webEx.Status != WebExceptionStatus.ProtocolError
858858
#endif
859859
) return null;

src/ServiceStack.Text/LicenseUtils.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public static void RegisterLicense(string licenseKeyText)
168168
JsConfig.InitStatics();
169169

170170
string subId = null;
171-
#if !(PCL || NETSTANDARD)
171+
#if !(PCL || NETSTANDARD1_1)
172172
var hold = Thread.CurrentThread.CurrentCulture;
173173
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
174174
#endif
@@ -207,7 +207,7 @@ public static void RegisterLicense(string licenseKeyText)
207207
}
208208
finally
209209
{
210-
#if !(PCL || NETSTANDARD)
210+
#if !(PCL || NETSTANDARD1_1)
211211
Thread.CurrentThread.CurrentCulture = hold;
212212
#endif
213213
}

src/ServiceStack.Text/PclExport.Net40.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !(XBOX || SL5 || NETFX_CORE || WP || PCL || NETSTANDARD)
1+
#if !(XBOX || SL5 || NETFX_CORE || WP || PCL || NETSTANDARD1_1)
22
using System;
33
using System.Collections;
44
using System.Collections.Concurrent;

src/ServiceStack.Text/PclExport.NetStandard.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//Copyright (c) Service Stack LLC. All Rights Reserved.
22
//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
33

4-
#if NETSTANDARD
4+
#if NETSTANDARD1_1
55
using System;
66
using System.Collections.Generic;
77
using System.IO;
@@ -12,7 +12,7 @@
1212
using ServiceStack.Text.Json;
1313
using System.Globalization;
1414
using System.Reflection.Emit;
15-
#if NETSTANDARD13
15+
#if NETSTANDARD1_3
1616
using System.Collections.Specialized;
1717
#endif
1818

@@ -147,7 +147,7 @@ public override DateTime ParseXsdDateTimeAsUtc(string dateTimeStr)
147147
// return TimeZoneInfo.ConvertTimeToUtc(dateTime);
148148
//}
149149

150-
#if NETSTANDARD13
150+
#if NETSTANDARD1_3
151151
public override ParseStringDelegate GetSpecializedCollectionParseMethod<TSerializer>(Type type)
152152
{
153153
if (type == typeof(StringCollection))

src/ServiceStack.Text/PclExport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static PclExport Instance
3737
= new Sl5PclExport()
3838
#elif NETFX_CORE
3939
= new WinStorePclExport()
40-
#elif NETSTANDARD
40+
#elif NETSTANDARD1_1
4141
= new NetStandardPclExport()
4242
#elif WP
4343
= new WpPclExport()

src/ServiceStack.Text/RecyclableMemoryStream.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ protected override void Dispose(bool disposing)
934934

935935
Events.Write.MemoryStreamFinalized(this.id, this.tag, this.allocationStack);
936936

937-
#if !(PCL || NETSTANDARD)
937+
#if !(PCL || NETSTANDARD1_1)
938938
if (AppDomain.CurrentDomain.IsFinalizingForUnload())
939939
{
940940
// If we're being finalized because of a shutdown, don't go any further.
@@ -971,7 +971,7 @@ protected override void Dispose(bool disposing)
971971
/// <summary>
972972
/// Equivalent to Dispose
973973
/// </summary>
974-
#if !(PCL || NETSTANDARD)
974+
#if !(PCL || NETSTANDARD1_1)
975975
public override void Close()
976976
#else
977977
public void Close()
@@ -1100,7 +1100,7 @@ public override bool CanWrite
11001100
/// <remarks>IMPORTANT: Doing a Write() after calling GetBuffer() invalidates the buffer. The old buffer is held onto
11011101
/// until Dispose is called, but the next time GetBuffer() is called, a new buffer from the pool will be required.</remarks>
11021102
/// <exception cref="ObjectDisposedException">Object has been disposed</exception>
1103-
#if !(PCL || NETSTANDARD)
1103+
#if !(PCL || NETSTANDARD1_1)
11041104
public override byte[] GetBuffer()
11051105
#else
11061106
public byte[] GetBuffer()

0 commit comments

Comments
 (0)