Skip to content

Commit 1ad87ea

Browse files
mythzmythz
committed
Upgrade to .NET Standard 2.0
1 parent 7dc5982 commit 1ad87ea

File tree

9 files changed

+35
-38
lines changed

9 files changed

+35
-38
lines changed

‎NuGet.Core/ServiceStack.Redis.Core/servicestack.redis.core.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<language>en-US</language>
2020
<copyright>ServiceStack 2017 and contributors</copyright>
2121
<dependencies>
22-
<group targetFramework=".NETStandard1.3">
22+
<group targetFramework=".netstandard2.0">
2323
<dependency id="System.Net.Security" version="[4.3.1, )" />
2424
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
2525
<dependency id="System.Collections.NonGeneric" version="[4.3.0, )" />

‎build/build-core.proj

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@
7272
<Delete Files="@(NugetPackageFilesToDelete)" />
7373

7474
<ItemGroup>
75-
<RedisCoreFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/netstandard1.3/ServiceStack.Redis.*"></RedisCoreFiles>
75+
<RedisCoreFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/netstandard2.0/ServiceStack.Redis.*"></RedisCoreFiles>
7676
</ItemGroup>
7777

7878
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.csproj"
7979
Targets="Build"
8080
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
8181

82-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard1.3" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard1.3')" />
83-
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard1.3" />
82+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard2.0')" />
83+
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard2.0" />
8484

8585
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis.Core/servicestack.redis.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion)"
8686
LogStandardErrorAsError="true" />

‎build/copy.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
REM SET BUILD=Debug
22
SET BUILD=Release
33

4-
COPY ..\src\ServiceStack.Redis\bin\%BUILD%\net45\ServiceStack.Redis.* ..\..\ServiceStack\lib
5-
COPY ..\src\ServiceStack.Redis\bin\%BUILD%\netstandard1.3\ServiceStack.Redis.* ..\..\ServiceStack\lib\netstandard1.3
4+
COPY ..\src\ServiceStack.Redis\bin\%BUILD%\net45\ServiceStack.Redis.* ..\..\ServiceStack\lib\net45
5+
COPY ..\src\ServiceStack.Redis\bin\%BUILD%\netstandard2.0\ServiceStack.Redis.* ..\..\ServiceStack\lib\netstandard2.0
66
COPY ..\src\ServiceStack.Redis\bin\Signed\net45\ServiceStack.Redis.* ..\..\ServiceStack\lib\signed

‎lib/copy.bat

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
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.Text\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* net45
7-
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\ServiceStack.Text.* netstandard1.1
8-
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\ServiceStack.Text.* netstandard1.3
8+
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* netstandard2.0
99
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* signed
1010

1111
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\net45\ServiceStack.Client.* net45
12-
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard1.1\ServiceStack.Client.* netstandard1.1
13-
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard1.6\ServiceStack.Client.* netstandard1.6
12+
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard2.0\ServiceStack.Client.* netstandard2.0
1413
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\Signed\net45\ServiceStack.Client.* signed
1514

1615
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\net45\ServiceStack.Common.* net45
17-
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard1.3\ServiceStack.Common.* netstandard1.3
16+
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard2.0\ServiceStack.Common.* netstandard2.0
1817
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\Signed\net45\ServiceStack.Common.* signed
1918

2019
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.dll net45
2120
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.xml net45
22-
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.dll netstandard1.6
23-
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.xml netstandard1.6
21+
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard2.0\ServiceStack.dll netstandard2.0
22+
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard2.0\ServiceStack.xml netstandard2.0
2423

2524
COPY ..\..\ServiceStack\src\ServiceStack.Server\bin\%BUILD%\net45\ServiceStack.Server.* net45
26-
COPY ..\..\ServiceStack\src\ServiceStack.Server\bin\%BUILD%\netstandard1.6\ServiceStack.Server.* netstandard1.6
25+
COPY ..\..\ServiceStack\src\ServiceStack.Server\bin\%BUILD%\netstandard2.0\ServiceStack.Server.* netstandard2.0

‎src/ServiceStack.Redis/ServiceStack.Redis.Signed.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<RootNamespace>ServiceStack.Redis</RootNamespace>
77
<PackageId>ServiceStack.Redis.Signed</PackageId>
88
<Configuration>Signed</Configuration>
9-
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
109
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1110
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1211
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -34,7 +33,7 @@
3433

3534
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3635
<Reference Include="System.Net" />
37-
<Reference Include="..\..\lib\pcl\ServiceStack.Interfaces.dll" />
36+
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
3837
<Reference Include="..\..\lib\signed\ServiceStack.Text.dll" />
3938
<Reference Include="..\..\lib\signed\ServiceStack.Common.dll" />
4039
</ItemGroup>

‎src/ServiceStack.Redis/ServiceStack.Redis.csproj

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
4+
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
55
<AssemblyName>ServiceStack.Redis</AssemblyName>
66
<PackageId>ServiceStack.Redis</PackageId>
7-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
87
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
98
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
109
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -32,26 +31,26 @@
3231
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3332
<Reference Include="System.Net" />
3433

35-
<Reference Include="..\..\lib\pcl\ServiceStack.Interfaces.dll" />
34+
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
3635
<Reference Include="..\..\lib\net45\ServiceStack.Text.dll" />
3736
<Reference Include="..\..\lib\net45\ServiceStack.Common.dll" />
3837
</ItemGroup>
3938

40-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
39+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
4140
<DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
4241
</PropertyGroup>
4342

44-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
43+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
4544
<PackageReference Include="System.Net.Security" Version="4.3.1" />
4645
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
4746
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
4847
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
4948
<PackageReference Include="System.Data.Common" Version="4.3.0" />
5049
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
5150

52-
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
53-
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
54-
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Common.dll" />
51+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
52+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Text.dll" />
53+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Common.dll" />
5554
</ItemGroup>
5655

5756
</Project>

‎tests/Console.Tests/Console.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<HintPath>..\..\lib\net45\ServiceStack.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="ServiceStack.Interfaces">
49-
<HintPath>..\..\lib\pcl\ServiceStack.Interfaces.dll</HintPath>
49+
<HintPath>..\..\lib\net45\ServiceStack.Interfaces.dll</HintPath>
5050
</Reference>
5151
<Reference Include="ServiceStack.Server">
5252
<HintPath>..\..\lib\net45\ServiceStack.Server.dll</HintPath>

‎tests/ServiceStack.Redis.Tests.Sentinel/ServiceStack.Redis.Tests.Sentinel.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Reference Include="System.Web" />
3838
<Reference Include="Microsoft.CSharp" />
3939

40-
<Reference Include="..\..\lib\pcl\ServiceStack.Interfaces.dll" />
40+
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
4141
<Reference Include="..\..\lib\net45\ServiceStack.Text.dll" />
4242
<Reference Include="..\..\lib\net45\ServiceStack.Common.dll" />
4343
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
@@ -61,12 +61,12 @@
6161
</ItemGroup>
6262

6363
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
64-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.1" />
64+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
6565

66-
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
67-
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
68-
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Common.dll" />
69-
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.dll" />
66+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
67+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Text.dll" />
68+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Common.dll" />
69+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.dll" />
7070
</ItemGroup>
7171

7272
</Project>

‎tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<Reference Include="System.Web.Extensions" />
3737
<Reference Include="Microsoft.CSharp" />
3838

39-
<Reference Include="..\..\lib\pcl\ServiceStack.Interfaces.dll" />
39+
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
4040
<Reference Include="..\..\lib\net45\ServiceStack.Text.dll" />
4141
<Reference Include="..\..\lib\net45\ServiceStack.Common.dll" />
4242
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
@@ -60,12 +60,12 @@
6060
</ItemGroup>
6161

6262
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
63-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.1" />
63+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
6464

65-
<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
66-
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
67-
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Common.dll" />
68-
<Reference Include="..\..\lib\netstandard1.6\ServiceStack.dll" />
65+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
66+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Text.dll" />
67+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Common.dll" />
68+
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.dll" />
6969
</ItemGroup>
7070

7171
</Project>

0 commit comments

Comments
 (0)