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

Commit 0a08d99

Browse files
mythzmythz
committed
Update to .NET Standard 2.0
1 parent 763004b commit 0a08d99

43 files changed

Lines changed: 119 additions & 240 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NuGet.Core/ServiceStack.Text.Core/servicestack.text.core.nuspec‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
<version>1.0.0</version>
77
<authors>ServiceStack</authors>
88
<owners>ServiceStack</owners>
9-
<summary>.NET's fastest JSON, JSV and CSV Text Serializers</summary>
9+
<summary>ServiceStack.Text.Core</summary>
1010
<description>
11-
.NET's fastest JSON, JSV and CSV Text Serializers. Fast, Light, Resilient.
12-
Contains ServiceStack's high-performance text-processing powers, for more info see: https://servicestack.net/text
11+
This package is deprecated. Use ServiceStack.Text instead.
1312
</description>
1413
<projectUrl>https://github.com/ServiceStack/ServiceStack.Text</projectUrl>
1514
<licenseUrl>https://servicestack.net/terms</licenseUrl>
@@ -19,32 +18,12 @@
1918
<language>en-US</language>
2019
<copyright>ServiceStack 2017 and contributors</copyright>
2120
<dependencies>
22-
<group targetFramework=".NETStandard1.1">
23-
<dependency id="Microsoft.Extensions.Primitives" version="[1.1.1, )" />
24-
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
25-
<dependency id="System.Runtime.Serialization.Xml" version="[4.3.0, )" />
26-
<dependency id="System.Net.Requests" version="[4.3.0, )" />
27-
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
28-
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
21+
<group targetFramework=".NETStandard2.0">
22+
<dependency id="Microsoft.Extensions.Primitives" version="[2.0.0, )" />
23+
<dependency id="System.Runtime" version="[4.3.0, )" />
2924
<dependency id="System.Reflection.Emit" version="[4.3.0, )" />
3025
<dependency id="System.Reflection.Emit.LightWeight" version="[4.3.0, )" />
31-
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
32-
<dependency id="System.Linq.Expressions" version="[4.3.0, )" />
33-
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.3.0, )" />
34-
</group>
35-
<group targetFramework=".NETStandard1.3">
36-
<dependency id="Microsoft.Extensions.Primitives" version="[1.1.1, )" />
37-
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
38-
<dependency id="System.Runtime.Serialization.Xml" version="[4.3.0, )" />
39-
<dependency id="System.Net.Requests" version="[4.3.0, )" />
40-
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
41-
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
42-
<dependency id="System.Reflection.Emit" version="[4.3.0, )" />
43-
<dependency id="System.Reflection.Emit.LightWeight" version="[4.3.0, )" />
44-
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
45-
<dependency id="System.Linq.Expressions" version="[4.3.0, )" />
46-
<dependency id="System.Collections" version="[4.3.0, )" />
47-
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
26+
<dependency id="Microsoft.CSharp" version="[4.4.0, )" />
4827
</group>
4928
</dependencies>
5029
</metadata>

‎build/build-core.proj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Default"
33
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
@@ -77,19 +77,15 @@
7777
<Delete Files="@(NugetPackageFilesToDelete)" />
7878

7979
<ItemGroup>
80-
<TextFilesNetStardard11 Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/netstandard1.1/ServiceStack.Text.*"></TextFilesNetStardard11>
81-
<TextFilesNetStardard13 Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/netstandard1.3/ServiceStack.Text.*"></TextFilesNetStardard13>
80+
<TextFilesNetStardard20 Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/netstandard2.0/ServiceStack.Text.*"></TextFilesNetStardard20>
8281
</ItemGroup>
8382

8483
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Text/ServiceStack.Text.csproj"
8584
Targets="Build"
8685
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
8786

88-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.1" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.1')" />
89-
<Copy SourceFiles="%(TextFilesNetStardard11.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.1" />
90-
91-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.3" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.3')" />
92-
<Copy SourceFiles="%(TextFilesNetStardard13.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.3" />
87+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard2.0')" />
88+
<Copy SourceFiles="%(TextFilesNetStardard20.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard2.0" />
9389

9490
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text.Core/servicestack.text.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion)"
9591
LogStandardErrorAsError="true" />

‎build/build.proj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@
5353
<Find>\d+\.\d+\.\d+\.\d+</Find>
5454
<ReplaceWith>$(Version)</ReplaceWith>
5555
</RegexTransform>
56+
5657
<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
5758
<Find>ServiceStackVersion = \d+\.\d+m;</Find>
5859
<ReplaceWith>ServiceStackVersion = $(EnvVersion)m;</ReplaceWith>
5960
</RegexTransform>
61+
6062
<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
6163
<Find>new DateTime.*</Find>
6264
<ReplaceWith>new DateTime($([System.DateTime]::Now.ToString(`yyyy,MM,dd`)));</ReplaceWith>
6365
</RegexTransform>
66+
6467
<!--Update Min Dependency Version -->
6568
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
6669
<Find>version="4\.5[^"]*"</Find>

‎build/copy.bat‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,15 @@ REM SET BUILD=Debug
33
SET BUILD=Release
44

55
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack\lib\net45
6+
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack\lib\netstandard2.0
67
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.Redis\lib\net45
8+
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.Redis\lib\netstandard2.0
79
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.OrmLite\lib\net45
10+
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.OrmLite\lib\netstandard2.0
811
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.Aws\lib\net45
12+
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.Aws\lib\netstandard2.0
913
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.Admin\lib\net45
14+
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.Admin\lib\netstandard2.0
1015
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\Stripe\lib\net45
16+
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\Stripe\lib\netstandard2.0
1117

12-
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack\lib\signed
13-
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.Redis\lib\signed
14-
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.OrmLite\lib\signed
15-
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.Aws\lib\signed
16-
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.Admin\lib\signed
17-
18-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack\lib\netstandard1.1
19-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack\lib\netstandard1.3
20-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack.Redis\lib\netstandard1.1
21-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack.Redis\lib\netstandard1.3
22-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack.OrmLite\lib\netstandard1.1
23-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack.OrmLite\lib\netstandard1.3
24-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack.Aws\lib\netstandard1.1
25-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack.Aws\lib\netstandard1.3
26-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\Admin\lib\netstandard1.1
27-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\Admin\lib\netstandard1.3
28-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\Stripe\lib\netstandard1.1
29-
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\Stripe\lib\netstandard1.3
30-
31-
COPY "..\src\ServiceStack.Text\bin\%BUILD%\portable45-net45+win8\ServiceStack.Text.dll" ..\..\ServiceStack\lib\pcl
32-
COPY "..\src\ServiceStack.Text\bin\%BUILD%\portable45-net45+win8\ServiceStack.Text.*" ..\..\Stripe\lib\pcl
33-
34-
COPY ..\src\ServiceStack.Text\bin\SL5\ServiceStack.Text.* ..\..\ServiceStack\lib\sl5

‎lib/copy.bat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
REM SET BUILD=Debug
22
SET BUILD=Release
33

4-
COPY "..\..\ServiceStack\src\ServiceStack.Interfaces\bin\%BUILD%\portable40-net45+sl5+win8+wp8+wpa81\ServiceStack.Interfaces.*" pcl
4+
COPY ..\..\ServiceStack\src\ServiceStack.Interfaces\bin\%BUILD%\net45\ServiceStack.Interfaces.* net45
5+
COPY ..\..\ServiceStack\src\ServiceStack.Interfaces\bin\%BUILD%\netstandard2.0\ServiceStack.Interfaces.* netstandard2.0
56

67
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\net45\ServiceStack.Client.* net45
7-
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard1.1\ServiceStack.Client.* netstandard1.1
8-
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard1.6\ServiceStack.Client.* netstandard1.6
8+
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard2.0\ServiceStack.Client.* netstandard2.0
99

1010
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\net45\ServiceStack.Common.* net45
11-
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard1.3\ServiceStack.Common.* netstandard1.3
11+
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard2.0\ServiceStack.Common.* netstandard2.0
1212

1313
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.dll net45
1414
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.xml net45
15-
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.dll netstandard1.6
16-
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.xml netstandard1.6
15+
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard2.0\ServiceStack.dll netstandard2.0
16+
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard2.0\ServiceStack.xml netstandard2.0
1717

‎src/ServiceStack.Text.sln‎

Lines changed: 9 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26403.7
3+
VisualStudioVersion = 15.0.26730.3
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F7FB50ED-EAFF-4839-935A-5BB4A4158245}"
66
ProjectSection(SolutionItems) = preProject
@@ -16,15 +16,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F7FB50ED
1616
..\NuGet.Core\ServiceStack.Text.Core\servicestack.text.core.nuspec = ..\NuGet.Core\ServiceStack.Text.Core\servicestack.text.core.nuspec
1717
..\NuGet\ServiceStack.Text\servicestack.text.nuspec = ..\NuGet\ServiceStack.Text\servicestack.text.nuspec
1818
..\NuGet.Signed\ServiceStack.Text.Signed\servicestack.text.signed.nuspec = ..\NuGet.Signed\ServiceStack.Text.Signed\servicestack.text.signed.nuspec
19+
..\build\build-core.proj = ..\build\build-core.proj
1920
EndProjectSection
2021
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
2223
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.Tests", "..\tests\ServiceStack.Text.Tests\ServiceStack.Text.Tests.csproj", "{9770BD40-AA3B-4785-B5E0-F4C470F9F14E}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.Tests", "..\tests\ServiceStack.Text.Tests\ServiceStack.Text.Tests.csproj", "{9770BD40-AA3B-4785-B5E0-F4C470F9F14E}"
2425
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.TestsConsole", "..\tests\ServiceStack.Text.TestsConsole\ServiceStack.Text.TestsConsole.csproj", "{DD3BEB33-2509-423A-8545-CE1A83684530}"
26-
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.Tests.xUnit", "..\tests\ServiceStack.Text.Tests.xUnit\ServiceStack.Text.Tests.xUnit.csproj", "{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.TestsConsole", "..\tests\ServiceStack.Text.TestsConsole\ServiceStack.Text.TestsConsole.csproj", "{DD3BEB33-2509-423A-8545-CE1A83684530}"
2827
EndProject
2928
Global
3029
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -142,46 +141,13 @@ Global
142141
{DD3BEB33-2509-423A-8545-CE1A83684530}.Signed|x86.Build.0 = Release|Any CPU
143142
{DD3BEB33-2509-423A-8545-CE1A83684530}.Signed|Xbox 360.ActiveCfg = Release|Any CPU
144143
{DD3BEB33-2509-423A-8545-CE1A83684530}.Signed|Xbox 360.Build.0 = Release|Any CPU
145-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
147-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|ARM.ActiveCfg = Debug|Any CPU
148-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|ARM.Build.0 = Debug|Any CPU
149-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
150-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
151-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x64.ActiveCfg = Debug|Any CPU
152-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x64.Build.0 = Debug|Any CPU
153-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x86.ActiveCfg = Debug|Any CPU
154-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x86.Build.0 = Debug|Any CPU
155-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
156-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Xbox 360.Build.0 = Debug|Any CPU
157-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
158-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Any CPU.Build.0 = Release|Any CPU
159-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|ARM.ActiveCfg = Release|Any CPU
160-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|ARM.Build.0 = Release|Any CPU
161-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
162-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
163-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x64.ActiveCfg = Release|Any CPU
164-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x64.Build.0 = Release|Any CPU
165-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x86.ActiveCfg = Release|Any CPU
166-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x86.Build.0 = Release|Any CPU
167-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Xbox 360.ActiveCfg = Release|Any CPU
168-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Xbox 360.Build.0 = Release|Any CPU
169-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Any CPU.ActiveCfg = Debug|Any CPU
170-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Any CPU.Build.0 = Debug|Any CPU
171-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|ARM.ActiveCfg = Debug|Any CPU
172-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|ARM.Build.0 = Debug|Any CPU
173-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Mixed Platforms.ActiveCfg = Debug|Any CPU
174-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Mixed Platforms.Build.0 = Debug|Any CPU
175-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x64.ActiveCfg = Debug|Any CPU
176-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x64.Build.0 = Debug|Any CPU
177-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x86.ActiveCfg = Debug|Any CPU
178-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x86.Build.0 = Debug|Any CPU
179-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Xbox 360.ActiveCfg = Debug|Any CPU
180-
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Xbox 360.Build.0 = Debug|Any CPU
181144
EndGlobalSection
182145
GlobalSection(SolutionProperties) = preSolution
183146
HideSolutionNode = FALSE
184147
EndGlobalSection
148+
GlobalSection(ExtensibilityGlobals) = postSolution
149+
SolutionGuid = {850F0B33-9062-4EE4-9C6D-4200AFA546D6}
150+
EndGlobalSection
185151
GlobalSection(MonoDevelopProperties) = preSolution
186152
StartupItem = ServiceStack.Text\ServiceStack.Text.csproj
187153
Policies = $0

‎src/ServiceStack.Text/Common/DeserializeArray.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System.Reflection;
1616
using System.Linq;
1717
using System.Threading;
18-
#if NETSTANDARD1_1
18+
#if NETSTANDARD2_0
1919
using Microsoft.Extensions.Primitives;
2020
#endif
2121
using ServiceStack.Text.Support;

‎src/ServiceStack.Text/Common/DeserializeBuiltin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
using System;
1414
using System.Globalization;
15-
#if NETSTANDARD1_1
15+
#if NETSTANDARD2_0
1616
using Microsoft.Extensions.Primitives;
1717
#endif
1818
using ServiceStack.Text.Support;

‎src/ServiceStack.Text/Common/DeserializeCollection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System.Reflection;
1616
using System.Threading;
1717
using System.Linq;
18-
#if NETSTANDARD1_1
18+
#if NETSTANDARD2_0
1919
using Microsoft.Extensions.Primitives;
2020
#else
2121
using ServiceStack.Text.Support;

‎src/ServiceStack.Text/Common/DeserializeCustomGenericType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Linq;
33
using ServiceStack.Text.Json;
4-
#if NETSTANDARD1_1
4+
#if NETSTANDARD2_0
55
using Microsoft.Extensions.Primitives;
66
#endif
77
using ServiceStack.Text.Support;

0 commit comments

Comments
 (0)