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

Commit

Permalink
Update Northwind.Common project + dlls
Browse files Browse the repository at this point in the history
  • Loading branch information
mythz committed Aug 20, 2018
1 parent 91fa1d3 commit d4a8629
Show file tree
Hide file tree
Showing 18 changed files with 327 additions and 211 deletions.
Binary file modified lib/net45/Northwind.Common.dll
Binary file not shown.
Binary file modified lib/net45/ServiceStack.Client.dll
Binary file not shown.
Binary file modified lib/net45/ServiceStack.Common.dll
Binary file not shown.
Binary file modified lib/net45/ServiceStack.Interfaces.dll
Binary file not shown.
Binary file modified lib/net45/ServiceStack.dll
Binary file not shown.
Binary file removed lib/net45/protobuf-net.Extensions.dll
Binary file not shown.
Binary file removed lib/net45/protobuf-net.dll
Binary file not shown.
330 changes: 238 additions & 92 deletions lib/netstandard2.0/Northwind.Common.deps.json

Large diffs are not rendered by default.

Binary file modified lib/netstandard2.0/Northwind.Common.dll
Binary file not shown.
157 changes: 71 additions & 86 deletions lib/netstandard2.0/ServiceStack.Client.deps.json

Large diffs are not rendered by default.

Binary file modified lib/netstandard2.0/ServiceStack.Client.dll
Binary file not shown.
30 changes: 13 additions & 17 deletions lib/netstandard2.0/ServiceStack.Common.deps.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"runtimeTarget": {
"name": ".NETStandard,Version=v2.0/",
"signature": "0700cb9fe2934fb1c41ee5d583f6f84900f6ee7d"
"signature": "6219967d8a6fa03213901d1909e55d499d2a54cf"
},
"compilationOptions": {},
"targets": {
Expand All @@ -17,7 +17,7 @@
"System.Memory": "4.5.1",
"System.Net.NetworkInformation": "4.3.0",
"System.Net.Requests": "4.3.0",
"System.Reflection.TypeExtensions": "4.3.0",
"System.Reflection.TypeExtensions": "4.5.0",
"System.Runtime.Serialization.Primitives": "4.3.0",
"System.ValueTuple": "4.5.0",
"ServiceStack.Text": "5.0.0.0"
Expand Down Expand Up @@ -199,7 +199,7 @@
"System.Reflection.Emit": "4.3.0",
"System.Reflection.Emit.ILGeneration": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
"System.Reflection.TypeExtensions": "4.3.0",
"System.Reflection.TypeExtensions": "4.5.0",
"System.Resources.ResourceManager": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
Expand Down Expand Up @@ -298,7 +298,7 @@
"System.Reflection.Emit.Lightweight": "4.3.0",
"System.Reflection.Extensions": "4.3.0",
"System.Reflection.Primitives": "4.3.0",
"System.Reflection.TypeExtensions": "4.3.0",
"System.Reflection.TypeExtensions": "4.5.0",
"System.Resources.ResourceManager": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.Extensions": "4.3.0",
Expand Down Expand Up @@ -519,15 +519,11 @@
"System.Runtime": "4.3.0"
}
},
"System.Reflection.TypeExtensions/4.3.0": {
"dependencies": {
"System.Reflection": "4.3.0",
"System.Runtime": "4.3.0"
},
"System.Reflection.TypeExtensions/4.5.0": {
"runtime": {
"lib/netstandard1.5/System.Reflection.TypeExtensions.dll": {
"assemblyVersion": "4.1.1.0",
"fileVersion": "4.6.24705.1"
"lib/netstandard2.0/System.Reflection.TypeExtensions.dll": {
"assemblyVersion": "4.1.3.0",
"fileVersion": "4.6.26515.6"
}
}
},
Expand Down Expand Up @@ -1247,12 +1243,12 @@
"path": "system.reflection.primitives/4.3.0",
"hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512"
},
"System.Reflection.TypeExtensions/4.3.0": {
"System.Reflection.TypeExtensions/4.5.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==",
"path": "system.reflection.typeextensions/4.3.0",
"hashPath": "system.reflection.typeextensions.4.3.0.nupkg.sha512"
"sha512": "sha512-jdK7She37kK5gtXbznOVwcfbtCb2vIs8UfMsYd2OFiGLmj+3oXrA3bgUQPzbe3boNJApkA7oLb42nCHQ0g813A==",
"path": "system.reflection.typeextensions/4.5.0",
"hashPath": "system.reflection.typeextensions.4.5.0.nupkg.sha512"
},
"System.Resources.ResourceManager/4.3.0": {
"type": "package",
Expand Down Expand Up @@ -1404,7 +1400,7 @@
"System.Threading.Overlapped/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-m3HQ2dPiX/DSTpf+yJt8B0c+SRvzfqAJKx+QDWi+VLhz8svLT23MVjEOHPF/KiSLeArKU/iHescrbLd3yVgyNg==",
"sha512": "sha512-LRcp7Ir4HQ3I7uIhUb8ypaMDw23W1t3GMCA2+yUxTL3HG9ZrVJtLufoK/mF9zfCG2bxuRBf1Bj8FC9mOPddhIg==",
"path": "system.threading.overlapped/4.3.0",
"hashPath": "system.threading.overlapped.4.3.0.nupkg.sha512"
},
Expand Down
Binary file modified lib/netstandard2.0/ServiceStack.Common.dll
Binary file not shown.
Binary file modified lib/netstandard2.0/ServiceStack.Interfaces.dll
Binary file not shown.
Binary file modified lib/netstandard2.0/ServiceStack.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion src/ServiceStack.Text/NetCoreMemory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public sealed class NetCoreMemory : MemoryProvider
private static NetCoreMemory provider;
public static NetCoreMemory Provider => provider ?? (provider = new NetCoreMemory());
private NetCoreMemory() { }

public static void Configure() => Instance = Provider;

public override bool ParseBoolean(ReadOnlySpan<char> value) => bool.Parse(value);
Expand Down
6 changes: 3 additions & 3 deletions tests/Northwind.Common/Northwind.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="protobuf-net" Version="2.3.2" />
<PackageReference Include="protobuf-net" Version="2.3.17" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
Expand All @@ -43,11 +43,11 @@
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
<PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.3.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
</ItemGroup>

Expand Down
13 changes: 1 addition & 12 deletions tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.1" />
Expand All @@ -51,24 +52,12 @@
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
<Reference Include="..\..\lib\net45\Northwind.Common.dll" />
</ItemGroup>
<!-- Enable NunitLite build, becase NUnit is not supported on .NET Core SDK 1.0.2
https://github.com/nunit/dotnet-test-nunit/issues/91
To enable NUnitLite pass /p:NUNITLITE=1 into msbuild arguments
-->
<PropertyGroup Condition=" '$(NUNITLITE)' != '' ">
<OutputType>Exe</OutputType>
<DefineConstants>$(DefineConstants);NUNITLITE</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(NUNITLITE)' != '' ">
<PackageReference Include="NUnitLite" Version="3.9.0" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE;NETSTANDARD2_0</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<ProjectReference Include="..\..\src\ServiceStack.Memory\ServiceStack.Memory.csproj" />
<PackageReference Include="System.Collections.Specialized" Version="4.*" />
<PackageReference Include="System.Runtime" Version="4.*" />
<PackageReference Include="System.Collections.NonGeneric" Version="4.*" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.*" />
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
Expand Down

0 comments on commit d4a8629

Please sign in to comment.