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

Commit

Permalink
Update to .NET Standard 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mythz
mythz committed Oct 8, 2017
1 parent 763004b commit 0a08d99
Show file tree
Hide file tree
Showing 43 changed files with 119 additions and 240 deletions.
33 changes: 6 additions & 27 deletions NuGet.Core/ServiceStack.Text.Core/servicestack.text.core.nuspec
View file
Expand Up @@ -6,10 +6,9 @@
<version>1.0.0</version>
<authors>ServiceStack</authors>
<owners>ServiceStack</owners>
<summary>.NET's fastest JSON, JSV and CSV Text Serializers</summary>
<summary>ServiceStack.Text.Core</summary>
<description>
.NET's fastest JSON, JSV and CSV Text Serializers. Fast, Light, Resilient.
Contains ServiceStack's high-performance text-processing powers, for more info see: https://servicestack.net/text
This package is deprecated. Use ServiceStack.Text instead.
</description>
<projectUrl>https://github.com/ServiceStack/ServiceStack.Text</projectUrl>
<licenseUrl>https://servicestack.net/terms</licenseUrl>
Expand All @@ -19,32 +18,12 @@
<language>en-US</language>
<copyright>ServiceStack 2017 and contributors</copyright>
<dependencies>
<group targetFramework=".NETStandard1.1">
<dependency id="Microsoft.Extensions.Primitives" version="[1.1.1, )" />
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
<dependency id="System.Runtime.Serialization.Xml" version="[4.3.0, )" />
<dependency id="System.Net.Requests" version="[4.3.0, )" />
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.Extensions.Primitives" version="[2.0.0, )" />
<dependency id="System.Runtime" version="[4.3.0, )" />
<dependency id="System.Reflection.Emit" version="[4.3.0, )" />
<dependency id="System.Reflection.Emit.LightWeight" version="[4.3.0, )" />
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
<dependency id="System.Linq.Expressions" version="[4.3.0, )" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.3.0, )" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="Microsoft.Extensions.Primitives" version="[1.1.1, )" />
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
<dependency id="System.Runtime.Serialization.Xml" version="[4.3.0, )" />
<dependency id="System.Net.Requests" version="[4.3.0, )" />
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
<dependency id="System.Reflection.Emit" version="[4.3.0, )" />
<dependency id="System.Reflection.Emit.LightWeight" version="[4.3.0, )" />
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
<dependency id="System.Linq.Expressions" version="[4.3.0, )" />
<dependency id="System.Collections" version="[4.3.0, )" />
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
<dependency id="Microsoft.CSharp" version="[4.4.0, )" />
</group>
</dependencies>
</metadata>
Expand Down
12 changes: 4 additions & 8 deletions build/build-core.proj
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Default"
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
Expand Down Expand Up @@ -77,19 +77,15 @@
<Delete Files="@(NugetPackageFilesToDelete)" />

<ItemGroup>
<TextFilesNetStardard11 Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/netstandard1.1/ServiceStack.Text.*"></TextFilesNetStardard11>
<TextFilesNetStardard13 Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/netstandard1.3/ServiceStack.Text.*"></TextFilesNetStardard13>
<TextFilesNetStardard20 Include="$(SrcDir)/ServiceStack.Text/bin/$(Configuration)/netstandard2.0/ServiceStack.Text.*"></TextFilesNetStardard20>
</ItemGroup>

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

<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.1" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.1')" />
<Copy SourceFiles="%(TextFilesNetStardard11.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.1" />

<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.3" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.3')" />
<Copy SourceFiles="%(TextFilesNetStardard13.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard1.3" />
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard2.0')" />
<Copy SourceFiles="%(TextFilesNetStardard20.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Text.Core/lib/netstandard2.0" />

<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Text.Core/servicestack.text.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion)"
LogStandardErrorAsError="true" />
Expand Down
3 changes: 3 additions & 0 deletions build/build.proj
View file
Expand Up @@ -53,14 +53,17 @@
<Find>\d+\.\d+\.\d+\.\d+</Find>
<ReplaceWith>$(Version)</ReplaceWith>
</RegexTransform>

<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
<Find>ServiceStackVersion = \d+\.\d+m;</Find>
<ReplaceWith>ServiceStackVersion = $(EnvVersion)m;</ReplaceWith>
</RegexTransform>

<RegexTransform Include="$(SrcDir)/ServiceStack.Text/Env.cs">
<Find>new DateTime.*</Find>
<ReplaceWith>new DateTime($([System.DateTime]::Now.ToString(`yyyy,MM,dd`)));</ReplaceWith>
</RegexTransform>

<!--Update Min Dependency Version -->
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
<Find>version="4\.5[^"]*"</Find>
Expand Down
29 changes: 6 additions & 23 deletions build/copy.bat
View file
Expand Up @@ -3,32 +3,15 @@ REM SET BUILD=Debug
SET BUILD=Release

COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack\lib\net45
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack\lib\netstandard2.0
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.Redis\lib\net45
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.Redis\lib\netstandard2.0
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.OrmLite\lib\net45
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.OrmLite\lib\netstandard2.0
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.Aws\lib\net45
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.Aws\lib\netstandard2.0
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\ServiceStack.Admin\lib\net45
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\ServiceStack.Admin\lib\netstandard2.0
COPY ..\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* ..\..\Stripe\lib\net45
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* ..\..\Stripe\lib\netstandard2.0

COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack\lib\signed
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.Redis\lib\signed
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.OrmLite\lib\signed
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.Aws\lib\signed
COPY ..\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* ..\..\ServiceStack.Admin\lib\signed

COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack\lib\netstandard1.1
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack\lib\netstandard1.3
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack.Redis\lib\netstandard1.1
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack.Redis\lib\netstandard1.3
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack.OrmLite\lib\netstandard1.1
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack.OrmLite\lib\netstandard1.3
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\ServiceStack.Aws\lib\netstandard1.1
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\ServiceStack.Aws\lib\netstandard1.3
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\Admin\lib\netstandard1.1
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\Admin\lib\netstandard1.3
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\*.* ..\..\Stripe\lib\netstandard1.1
COPY ..\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\*.* ..\..\Stripe\lib\netstandard1.3

COPY "..\src\ServiceStack.Text\bin\%BUILD%\portable45-net45+win8\ServiceStack.Text.dll" ..\..\ServiceStack\lib\pcl
COPY "..\src\ServiceStack.Text\bin\%BUILD%\portable45-net45+win8\ServiceStack.Text.*" ..\..\Stripe\lib\pcl

COPY ..\src\ServiceStack.Text\bin\SL5\ServiceStack.Text.* ..\..\ServiceStack\lib\sl5
12 changes: 6 additions & 6 deletions lib/copy.bat
View file
@@ -1,17 +1,17 @@
REM SET BUILD=Debug
SET BUILD=Release

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

COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\net45\ServiceStack.Client.* net45
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard1.1\ServiceStack.Client.* netstandard1.1
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard1.6\ServiceStack.Client.* netstandard1.6
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard2.0\ServiceStack.Client.* netstandard2.0

COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\net45\ServiceStack.Common.* net45
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard1.3\ServiceStack.Common.* netstandard1.3
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard2.0\ServiceStack.Common.* netstandard2.0

COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.dll net45
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.xml net45
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.dll netstandard1.6
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.xml netstandard1.6
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard2.0\ServiceStack.dll netstandard2.0
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard2.0\ServiceStack.xml netstandard2.0

52 changes: 9 additions & 43 deletions src/ServiceStack.Text.sln
View file
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
VisualStudioVersion = 15.0.26730.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F7FB50ED-EAFF-4839-935A-5BB4A4158245}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -16,15 +16,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F7FB50ED
..\NuGet.Core\ServiceStack.Text.Core\servicestack.text.core.nuspec = ..\NuGet.Core\ServiceStack.Text.Core\servicestack.text.core.nuspec
..\NuGet\ServiceStack.Text\servicestack.text.nuspec = ..\NuGet\ServiceStack.Text\servicestack.text.nuspec
..\NuGet.Signed\ServiceStack.Text.Signed\servicestack.text.signed.nuspec = ..\NuGet.Signed\ServiceStack.Text.Signed\servicestack.text.signed.nuspec
..\build\build-core.proj = ..\build\build-core.proj
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.Tests", "..\tests\ServiceStack.Text.Tests\ServiceStack.Text.Tests.csproj", "{9770BD40-AA3B-4785-B5E0-F4C470F9F14E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.Tests", "..\tests\ServiceStack.Text.Tests\ServiceStack.Text.Tests.csproj", "{9770BD40-AA3B-4785-B5E0-F4C470F9F14E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.TestsConsole", "..\tests\ServiceStack.Text.TestsConsole\ServiceStack.Text.TestsConsole.csproj", "{DD3BEB33-2509-423A-8545-CE1A83684530}"
EndProject
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}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.TestsConsole", "..\tests\ServiceStack.Text.TestsConsole\ServiceStack.Text.TestsConsole.csproj", "{DD3BEB33-2509-423A-8545-CE1A83684530}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -142,46 +141,13 @@ Global
{DD3BEB33-2509-423A-8545-CE1A83684530}.Signed|x86.Build.0 = Release|Any CPU
{DD3BEB33-2509-423A-8545-CE1A83684530}.Signed|Xbox 360.ActiveCfg = Release|Any CPU
{DD3BEB33-2509-423A-8545-CE1A83684530}.Signed|Xbox 360.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|ARM.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x64.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x64.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x86.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|x86.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Debug|Xbox 360.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Any CPU.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|ARM.ActiveCfg = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|ARM.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x64.ActiveCfg = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x64.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x86.ActiveCfg = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|x86.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Xbox 360.ActiveCfg = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Release|Xbox 360.Build.0 = Release|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Any CPU.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Any CPU.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|ARM.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|ARM.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Mixed Platforms.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Mixed Platforms.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x64.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x64.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x86.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|x86.Build.0 = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Xbox 360.ActiveCfg = Debug|Any CPU
{1AF464DD-1F82-49D0-9FA6-516D1F2A0B4D}.Signed|Xbox 360.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {850F0B33-9062-4EE4-9C6D-4200AFA546D6}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = ServiceStack.Text\ServiceStack.Text.csproj
Policies = $0
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeArray.cs
View file
Expand Up @@ -15,7 +15,7 @@
using System.Reflection;
using System.Linq;
using System.Threading;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeBuiltin.cs
View file
Expand Up @@ -12,7 +12,7 @@

using System;
using System.Globalization;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeCollection.cs
View file
Expand Up @@ -15,7 +15,7 @@
using System.Reflection;
using System.Threading;
using System.Linq;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeCustomGenericType.cs
View file
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using ServiceStack.Text.Json;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeDictionary.cs
View file
Expand Up @@ -20,7 +20,7 @@
using ServiceStack.Text.Json;
using ServiceStack.Text.Pools;
using ServiceStack.Text.Support;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeKeyValuePair.cs
View file
Expand Up @@ -19,7 +19,7 @@
using System.Threading;
using ServiceStack.Text.Json;
using ServiceStack.Text.Pools;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeListWithElements.cs
View file
Expand Up @@ -17,7 +17,7 @@
using System.Reflection;
using System.Threading;
using ServiceStack.Text.Json;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeSpecializedCollections.cs
View file
@@ -1,7 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeType.cs
View file
Expand Up @@ -16,7 +16,7 @@
using System.Linq;
using System.Reflection;
using ServiceStack.Text.Support;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeTypeRefJson.cs
View file
Expand Up @@ -3,7 +3,7 @@
using System.Globalization;
using System.Reflection;
using ServiceStack.Text.Json;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeTypeRefJsv.cs
View file
Expand Up @@ -3,7 +3,7 @@
using ServiceStack.Text.Json;
using ServiceStack.Text.Jsv;
using ServiceStack.Text.Support;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/DeserializeTypeUtils.cs
View file
Expand Up @@ -12,7 +12,7 @@

using System;
using System.Reflection;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/ITypeSerializer.cs
View file
@@ -1,7 +1,7 @@
using System;
using System.IO;
using ServiceStack.Text.Json;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/JsDelegates.cs
View file
Expand Up @@ -13,7 +13,7 @@
using System;
using System.Collections.Generic;
using System.IO;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/Common/JsReader.cs
View file
Expand Up @@ -2,7 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
#if NETSTANDARD1_1
#if NETSTANDARD2_0
using Microsoft.Extensions.Primitives;
#else
using ServiceStack.Text.Support;
Expand Down

0 comments on commit 0a08d99

Please sign in to comment.