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

Commit cb41a38

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.Text
2 parents d099a9a + ddb44b8 commit cb41a38

File tree

3 files changed

+47
-50
lines changed

3 files changed

+47
-50
lines changed

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

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,29 @@
2020
<copyright>ServiceStack 2017 and contributors</copyright>
2121
<dependencies>
2222
<group targetFramework=".NETStandard1.1">
23-
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
24-
<dependency id="System.Runtime.Serialization.Xml" version="[4.1.1, )" />
25-
<dependency id="System.Net.Requests" version="[4.0.11, )" />
26-
<dependency id="System.Dynamic.Runtime" version="[4.0.11, )" />
27-
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
28-
<dependency id="System.Reflection.Emit" version="[4.0.1, )" />
29-
<dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
30-
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
31-
<dependency id="NETStandard.Library" version="[1.6.0, )" />
23+
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
24+
<dependency id="System.Runtime.Serialization.Xml" version="[4.3.0, )" />
25+
<dependency id="System.Net.Requests" version="[4.3.0, )" />
26+
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
27+
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
28+
<dependency id="System.Reflection.Emit" version="[4.3.0, )" />
29+
<dependency id="System.Reflection.Emit.LightWeight" version="[4.3.0, )" />
30+
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
31+
<dependency id="System.Linq.Expressions" version="[4.3.0, )" />
32+
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.3.0, )" />
3233
</group>
3334
<group targetFramework=".NETStandard1.3">
34-
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
35-
<dependency id="System.Runtime.Serialization.Xml" version="[4.1.1, )" />
36-
<dependency id="System.Net.Requests" version="[4.0.11, )" />
37-
<dependency id="System.Dynamic.Runtime" version="[4.0.11, )" />
38-
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
39-
<dependency id="System.Reflection.Emit" version="[4.0.1, )" />
40-
<dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
41-
<dependency id="System.Linq.Expressions" version="[4.1.0, )" />
42-
<dependency id="System.Collections.Specialized" version="[4.0.1, )" />
43-
<dependency id="NETStandard.Library" version="[1.6.0, )" />
35+
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
36+
<dependency id="System.Runtime.Serialization.Xml" version="[4.3.0, )" />
37+
<dependency id="System.Net.Requests" version="[4.3.0, )" />
38+
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
39+
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
40+
<dependency id="System.Reflection.Emit" version="[4.3.0, )" />
41+
<dependency id="System.Reflection.Emit.LightWeight" version="[4.3.0, )" />
42+
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
43+
<dependency id="System.Linq.Expressions" version="[4.3.0, )" />
44+
<dependency id="System.Collections" version="[4.3.0, )" />
45+
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
4446
</group>
4547
</dependencies>
4648
</metadata>

‎src/ServiceStack.Text/ServiceStack.Text.csproj

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
55
<AssemblyName>ServiceStack.Text</AssemblyName>
66
<PackageId>ServiceStack.Text</PackageId>
7-
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
87
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
98
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
109
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -40,38 +39,34 @@
4039
</PropertyGroup>
4140

4241
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
43-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1-*" />
44-
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.1.1" />
45-
<PackageReference Include="System.Net.Requests" Version="4.0.11" />
46-
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
47-
<PackageReference Include="Microsoft.CSharp" Version="4.0.1-*" />
48-
<PackageReference Include="System.Reflection.Emit" Version="4.0.1" />
49-
<PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.0.1" />
50-
<PackageReference Include="System.Reflection.Extensions" Version="4.0.1" />
51-
<PackageReference Include="System.Linq.Expressions" Version="4.1.0" />
52-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
42+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
43+
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
44+
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
45+
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
46+
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
47+
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
48+
<PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.3.0" />
49+
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
50+
<PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
51+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
5352
</ItemGroup>
5453

5554
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
5655
<DefineConstants>$(DefineConstants);NETSTANDARD1_1;NETSTANDARD1_3</DefineConstants>
5756
</PropertyGroup>
5857

5958
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
60-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1-*" />
61-
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.1.1" />
62-
<PackageReference Include="System.Net.Requests" Version="4.0.11" />
63-
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
64-
<PackageReference Include="Microsoft.CSharp" Version="4.0.1-*" />
65-
<PackageReference Include="System.Linq.Expressions" Version="4.1.0" />
66-
<PackageReference Include="System.Collections" Version="4.0.11" />
67-
<PackageReference Include="System.Collections.Concurrent" Version="4.0.12" />
68-
<PackageReference Include="System.Collections.NonGeneric" Version="4.0.1" />
69-
<PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
70-
<PackageReference Include="System.Reflection" Version="4.1.0" />
71-
<PackageReference Include="System.Reflection.Emit" Version="4.0.1" />
72-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.0.1" />
73-
<PackageReference Include="System.Reflection.Extensions" Version="4.0.1" />
74-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
59+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
60+
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
61+
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
62+
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
63+
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
64+
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
65+
<PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.3.0" />
66+
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
67+
<PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
68+
<PackageReference Include="System.Collections" Version="4.3.0" />
69+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
7570
</ItemGroup>
7671

7772
</Project>

‎tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
5757
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
5858
<PackageReference Include="System.Drawing.Primitives" Version="4.*" />
59-
<PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
60-
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.0.2" />
61-
<PackageReference Include="System.Collections.NonGeneric" Version="4.0.1" />
59+
<PackageReference Include="System.Collections.Specialized" Version="4.*" />
60+
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.*" />
61+
<PackageReference Include="System.Collections.NonGeneric" Version="4.*" />
6262
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.*" />
63-
<PackageReference Include="System.Reflection.Extensions" Version="4.0.1" />
64-
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.1.0" />
63+
<PackageReference Include="System.Reflection.Extensions" Version="4.*" />
64+
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.*" />
6565

6666
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
6767
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.Client.dll" />

0 commit comments

Comments
 (0)