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

Commit 3392ffa

Browse files
mythzmythz
committed
Upgrade to v6
1 parent 987eab6 commit 3392ffa

File tree

11 files changed

+38
-90
lines changed

11 files changed

+38
-90
lines changed

‎build/build-core.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>

‎build/build.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>

‎src/Directory.Build.props

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>5.14.0</Version>
4+
<Version>6.0.0</Version>
55
<Authors>ServiceStack</Authors>
66
<Company>ServiceStack, Inc.</Company>
77
<Copyright>&#169; 2008-2022 ServiceStack, Inc</Copyright>
@@ -24,25 +24,17 @@
2424
<Optimize>true</Optimize>
2525
</PropertyGroup>
2626

27-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net472' ">
28-
<DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
27+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
28+
<DefineConstants>$(DefineConstants);NETFX;NET45;NET472</DefineConstants>
2929
<SignAssembly>True</SignAssembly>
3030
<DelaySign>False</DelaySign>
3131
<AssemblyOriginatorKeyFile>../servicestack.snk</AssemblyOriginatorKeyFile>
3232
</PropertyGroup>
3333

34-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
35-
<DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
36-
</PropertyGroup>
37-
3834
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
3935
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
4036
</PropertyGroup>
4137

42-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
43-
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
44-
</PropertyGroup>
45-
4638
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
4739
<DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
4840
</PropertyGroup>

‎src/ServiceStack.Admin.Web/ServiceStack.Admin.Web.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AppDesignerFolder>Properties</AppDesignerFolder>
1515
<RootNamespace>ServiceStack.Admin.Web</RootNamespace>
1616
<AssemblyName>ServiceStack.Admin.Web</AssemblyName>
17-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
2020
<IISExpressAnonymousAuthentication />

‎src/ServiceStack.Admin.sln

+6-34
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2010
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32112.339
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Admin", "ServiceStack.Admin\ServiceStack.Admin.csproj", "{C6EB693E-64D1-4271-BE68-0B78D186003E}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2A9F798E-B4A8-4089-AF2D-E841BB354244}"
99
ProjectSection(SolutionItems) = preProject
10+
..\build\build-core.proj = ..\build\build-core.proj
1011
..\build\build.bat = ..\build\build.bat
1112
..\build\build.proj = ..\build\build.proj
1213
Directory.Build.props = Directory.Build.props
13-
..\build\sync.bat = ..\build\sync.bat
14-
ServiceStack.Admin\ServiceStack.Admin.Core.csproj = ServiceStack.Admin\ServiceStack.Admin.Core.csproj
15-
..\build\build-core.proj = ..\build\build-core.proj
1614
..\tests\Directory.Build.props = ..\tests\Directory.Build.props
15+
..\NuGet.Config = ..\NuGet.Config
16+
ServiceStack.Admin\ServiceStack.Admin.Core.csproj = ServiceStack.Admin\ServiceStack.Admin.Core.csproj
17+
..\build\sync.bat = ..\build\sync.bat
1718
EndProjectSection
1819
EndProject
1920
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BC1E449B-0360-4DF6-9FA4-049CCD434301}"
2021
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.Tasks", "..\tests\Admin.Tasks\Admin.Tasks.csproj", "{ADC92EAC-0D95-4D44-AE0A-CF0B740D6EF6}"
22-
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSelfHost", "..\tests\TestSelfHost\TestSelfHost.csproj", "{50CBC7E3-0C5F-4600-A364-49D38CEEF89D}"
24-
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestVirtualWebHost", "..\tests\TestVirtualWebHost\TestVirtualWebHost.csproj", "{F5FC4C28-F62B-41D2-B351-8FDC298AFA5B}"
26-
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Admin.Web", "ServiceStack.Admin.Web\ServiceStack.Admin.Web.csproj", "{F4DBDDEF-2F92-4EDF-96A8-A33F8F14C42B}"
28-
EndProject
2922
Global
3023
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3124
Debug|Any CPU = Debug|Any CPU
@@ -36,31 +29,10 @@ Global
3629
{C6EB693E-64D1-4271-BE68-0B78D186003E}.Debug|Any CPU.Build.0 = Debug|Any CPU
3730
{C6EB693E-64D1-4271-BE68-0B78D186003E}.Release|Any CPU.ActiveCfg = Release|Any CPU
3831
{C6EB693E-64D1-4271-BE68-0B78D186003E}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{ADC92EAC-0D95-4D44-AE0A-CF0B740D6EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{ADC92EAC-0D95-4D44-AE0A-CF0B740D6EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{ADC92EAC-0D95-4D44-AE0A-CF0B740D6EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{ADC92EAC-0D95-4D44-AE0A-CF0B740D6EF6}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{50CBC7E3-0C5F-4600-A364-49D38CEEF89D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{50CBC7E3-0C5F-4600-A364-49D38CEEF89D}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{50CBC7E3-0C5F-4600-A364-49D38CEEF89D}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{50CBC7E3-0C5F-4600-A364-49D38CEEF89D}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{F5FC4C28-F62B-41D2-B351-8FDC298AFA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{F5FC4C28-F62B-41D2-B351-8FDC298AFA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{F5FC4C28-F62B-41D2-B351-8FDC298AFA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{F5FC4C28-F62B-41D2-B351-8FDC298AFA5B}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{F4DBDDEF-2F92-4EDF-96A8-A33F8F14C42B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{F4DBDDEF-2F92-4EDF-96A8-A33F8F14C42B}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{F4DBDDEF-2F92-4EDF-96A8-A33F8F14C42B}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{F4DBDDEF-2F92-4EDF-96A8-A33F8F14C42B}.Release|Any CPU.Build.0 = Release|Any CPU
5532
EndGlobalSection
5633
GlobalSection(SolutionProperties) = preSolution
5734
HideSolutionNode = FALSE
5835
EndGlobalSection
59-
GlobalSection(NestedProjects) = preSolution
60-
{ADC92EAC-0D95-4D44-AE0A-CF0B740D6EF6} = {BC1E449B-0360-4DF6-9FA4-049CCD434301}
61-
{50CBC7E3-0C5F-4600-A364-49D38CEEF89D} = {BC1E449B-0360-4DF6-9FA4-049CCD434301}
62-
{F5FC4C28-F62B-41D2-B351-8FDC298AFA5B} = {BC1E449B-0360-4DF6-9FA4-049CCD434301}
63-
EndGlobalSection
6436
GlobalSection(ExtensibilityGlobals) = postSolution
6537
SolutionGuid = {BDF25A62-1D58-40B3-8BE8-9161059150F2}
6638
EndGlobalSection

‎src/ServiceStack.Admin/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[assembly: System.Runtime.InteropServices.ComVisible(false)]
22
[assembly: System.Runtime.InteropServices.Guid("c6eb693e-64d1-4271-be68-0b78d186003e")]
3-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
3+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.Admin/ServiceStack.Admin.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PackageId>ServiceStack.Admin</PackageId>
55
<AssemblyName>ServiceStack.Admin</AssemblyName>
6-
<TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
77
<Title>ServiceStack Admin UI and AutoQuery Browser</Title>
88
<PackageDescription>
99
ServiceStack Admin UI with AutoQuery Viewer - an instant UI for constructing
@@ -21,7 +21,7 @@
2121
<PackageReference Include="System.Memory" Version="4.5.4" />
2222
</ItemGroup>
2323

24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
2525
<Reference Include="System.Net" />
2626
<Reference Include="System.Web" />
2727
</ItemGroup>

‎tests/Admin.Tasks/Admin.Tasks.csproj

+19-19
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Admin.Tasks</RootNamespace>
1111
<AssemblyName>Admin.Tasks</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,40 +36,40 @@
3636
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
3737
<HintPath>..\..\src\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
3838
</Reference>
39-
<Reference Include="ServiceStack, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
40-
<HintPath>..\..\src\packages\ServiceStack.5.12.0\lib\net45\ServiceStack.dll</HintPath>
39+
<Reference Include="ServiceStack, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
40+
<HintPath>..\..\src\packages\ServiceStack.6.0.0\lib\net45\ServiceStack.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
44-
<HintPath>..\..\src\packages\ServiceStack.Client.5.12.0\lib\net45\ServiceStack.Client.dll</HintPath>
43+
<Reference Include="ServiceStack.Client, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
44+
<HintPath>..\..\src\packages\ServiceStack.Client.6.0.0\lib\net45\ServiceStack.Client.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
48-
<HintPath>..\..\src\packages\ServiceStack.Common.5.12.0\lib\net45\ServiceStack.Common.dll</HintPath>
47+
<Reference Include="ServiceStack.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
48+
<HintPath>..\..\src\packages\ServiceStack.Common.6.0.0\lib\net45\ServiceStack.Common.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
51-
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
52-
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.12.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
51+
<Reference Include="ServiceStack.Interfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
52+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.6.0.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
56-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.5.12.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
55+
<Reference Include="ServiceStack.OrmLite, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
56+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.6.0.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
59-
<Reference Include="ServiceStack.OrmLite.Sqlite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
60-
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.5.12.0\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
59+
<Reference Include="ServiceStack.OrmLite.Sqlite, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
60+
<HintPath>..\..\src\packages\ServiceStack.OrmLite.Sqlite.6.0.0\lib\net45\ServiceStack.OrmLite.Sqlite.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
63-
<Reference Include="ServiceStack.Redis, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
64-
<HintPath>..\..\src\packages\ServiceStack.Redis.5.12.0\lib\net45\ServiceStack.Redis.dll</HintPath>
63+
<Reference Include="ServiceStack.Redis, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
64+
<HintPath>..\..\src\packages\ServiceStack.Redis.6.0.0\lib\net45\ServiceStack.Redis.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
67-
<Reference Include="ServiceStack.Server, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
68-
<HintPath>..\..\src\packages\ServiceStack.Server.5.12.0\lib\net45\ServiceStack.Server.dll</HintPath>
67+
<Reference Include="ServiceStack.Server, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
68+
<HintPath>..\..\src\packages\ServiceStack.Server.6.0.0\lib\net45\ServiceStack.Server.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
71-
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
72-
<HintPath>..\..\src\packages\ServiceStack.Text.5.12.0\lib\net45\ServiceStack.Text.dll</HintPath>
71+
<Reference Include="ServiceStack.Text, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
72+
<HintPath>..\..\src\packages\ServiceStack.Text.6.0.0\lib\net45\ServiceStack.Text.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="System" />

‎tests/Directory.Build.props

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>5.14.0</Version>
4+
<Version>6.0.0</Version>
55
<LangVersion>latest</LangVersion>
66
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
77
</PropertyGroup>
@@ -10,18 +10,6 @@
1010
<DefineConstants>DEBUG</DefineConstants>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
14-
<DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
18-
<DefineConstants>$(DefineConstants);NETFX;NET46</DefineConstants>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
22-
<DefineConstants>$(DefineConstants);NETFX;NET461</DefineConstants>
23-
</PropertyGroup>
24-
2513
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
2614
<DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
2715
</PropertyGroup>
@@ -30,15 +18,11 @@
3018
<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
3119
</PropertyGroup>
3220

33-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
34-
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
35-
</PropertyGroup>
36-
3721
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
3822
<DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
3923
</PropertyGroup>
4024

41-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
4226
<DefineConstants>$(DefineConstants);NETCORE;NETCORE_SUPPORT</DefineConstants>
4327
</PropertyGroup>
4428

‎tests/TestSelfHost/TestSelfHost.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>TestSelfHost</RootNamespace>
1111
<AssemblyName>TestSelfHost</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<NuGetPackageImportStamp>
1515
</NuGetPackageImportStamp>

‎tests/TestVirtualWebHost/TestVirtualWebHost.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AppDesignerFolder>Properties</AppDesignerFolder>
1616
<RootNamespace>TestVirtualWebHost</RootNamespace>
1717
<AssemblyName>TestVirtualWebHost</AssemblyName>
18-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1919
<UseIISExpress>true</UseIISExpress>
2020
<IISExpressSSLPort />
2121
<IISExpressAnonymousAuthentication />

0 commit comments

Comments
 (0)