Skip to content

Commit 45ff22b

Browse files
mythzmythz
committed
Convert Console.Tests to .NET 5 Console App
1 parent 11a48e3 commit 45ff22b

File tree

5 files changed

+31
-193
lines changed

5 files changed

+31
-193
lines changed

‎src/ServiceStack.Redis.sln

+14-12
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Redis", "Servi
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Redis.Tests", "..\tests\ServiceStack.Redis.Tests\ServiceStack.Redis.Tests.csproj", "{951D28EE-5D22-4C62-AC0F-1661A8CEEC5A}"
2121
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console.Tests", "..\tests\Console.Tests\Console.Tests.csproj", "{8368C965-B4F6-4263-9ABB-731A175B2E77}"
23-
EndProject
2422
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Redis.Tests.Sentinel", "..\tests\ServiceStack.Redis.Tests.Sentinel\ServiceStack.Redis.Tests.Sentinel.csproj", "{91C55091-A946-49B5-9517-8794EBCC5784}"
2523
EndProject
2624
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Redis.Benchmark", "..\tests\ServiceStack.Redis.Benchmark\ServiceStack.Redis.Benchmark.csproj", "{959CA5FE-6525-4EEF-86CA-F4978BEFF14F}"
2725
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console.Tests", "..\tests\Console.Tests\Console.Tests.csproj", "{56DEDC64-B349-4150-BE9C-5805D831678D}"
27+
EndProject
2828
Global
2929
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3030
Debug|Any CPU = Debug|Any CPU
@@ -59,16 +59,6 @@ Global
5959
{951D28EE-5D22-4C62-AC0F-1661A8CEEC5A}.Release|x64.Build.0 = Release|Any CPU
6060
{951D28EE-5D22-4C62-AC0F-1661A8CEEC5A}.Release|x86.ActiveCfg = Release|Any CPU
6161
{951D28EE-5D22-4C62-AC0F-1661A8CEEC5A}.Release|x86.Build.0 = Release|Any CPU
62-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
64-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Debug|x64.ActiveCfg = Debug|Any CPU
65-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Debug|x64.Build.0 = Debug|Any CPU
66-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Debug|x86.ActiveCfg = Debug|Any CPU
67-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
68-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Release|x64.ActiveCfg = Release|Any CPU
70-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Release|x64.Build.0 = Release|Any CPU
71-
{8368C965-B4F6-4263-9ABB-731A175B2E77}.Release|x86.ActiveCfg = Release|Any CPU
7262
{91C55091-A946-49B5-9517-8794EBCC5784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7363
{91C55091-A946-49B5-9517-8794EBCC5784}.Debug|Any CPU.Build.0 = Debug|Any CPU
7464
{91C55091-A946-49B5-9517-8794EBCC5784}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -91,6 +81,18 @@ Global
9181
{959CA5FE-6525-4EEF-86CA-F4978BEFF14F}.Release|x64.Build.0 = Release|Any CPU
9282
{959CA5FE-6525-4EEF-86CA-F4978BEFF14F}.Release|x86.ActiveCfg = Release|Any CPU
9383
{959CA5FE-6525-4EEF-86CA-F4978BEFF14F}.Release|x86.Build.0 = Release|Any CPU
84+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Debug|Any CPU.Build.0 = Debug|Any CPU
86+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Debug|x64.ActiveCfg = Debug|Any CPU
87+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Debug|x64.Build.0 = Debug|Any CPU
88+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Debug|x86.ActiveCfg = Debug|Any CPU
89+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Debug|x86.Build.0 = Debug|Any CPU
90+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Release|Any CPU.ActiveCfg = Release|Any CPU
91+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Release|Any CPU.Build.0 = Release|Any CPU
92+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Release|x64.ActiveCfg = Release|Any CPU
93+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Release|x64.Build.0 = Release|Any CPU
94+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Release|x86.ActiveCfg = Release|Any CPU
95+
{56DEDC64-B349-4150-BE9C-5805D831678D}.Release|x86.Build.0 = Release|Any CPU
9496
EndGlobalSection
9597
GlobalSection(SolutionProperties) = preSolution
9698
HideSolutionNode = FALSE

‎tests/Console.Tests/App.config

-22
This file was deleted.

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

+17-115
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8368C965-B4F6-4263-9ABB-731A175B2E77}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>ConsoleTests</RootNamespace>
11-
<AssemblyName>Console.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
<Prefer32Bit>false</Prefer32Bit>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="mscorlib" />
39-
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
40-
<HintPath>..\..\src\packages\ServiceStack.Common.5.6.1\lib\net45\ServiceStack.Common.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
44-
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.6.1\lib\net45\ServiceStack.Interfaces.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
48-
<HintPath>..\..\src\packages\ServiceStack.Text.5.7.1\lib\net45\ServiceStack.Text.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="System" />
52-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
53-
<HintPath>..\..\src\packages\System.Buffers.4.5.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
54-
<Private>True</Private>
55-
</Reference>
56-
<Reference Include="System.Configuration" />
57-
<Reference Include="System.Core" />
58-
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="System.Net" />
62-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
63-
<HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="System.ServiceModel" />
67-
<Reference Include="System.Threading" />
68-
<Reference Include="System.Threading.Tasks" />
69-
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
70-
<HintPath>..\..\src\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="System.Web" />
74-
<Reference Include="System.Xml.Linq" />
75-
<Reference Include="System.Data.DataSetExtensions" />
76-
<Reference Include="Microsoft.CSharp" />
77-
<Reference Include="System.Data" />
78-
<Reference Include="System.Xml" />
79-
</ItemGroup>
80-
<ItemGroup>
81-
<Compile Include="BlockingPop.cs" />
82-
<Compile Include="BlockingRemoveAfterReconnection.cs" />
83-
<Compile Include="BrPopAfterReconnection.cs" />
84-
<Compile Include="ForceFailover.cs" />
85-
<Compile Include="MasterFailoverWithPassword.cs" />
86-
<Compile Include="MultiBlockingRemoveAfterReconnection.cs" />
87-
<Compile Include="NetworkRedisSentinelFailoverTests.cs" />
88-
<Compile Include="GoogleRedisSentinelFailoverTests.cs" />
89-
<Compile Include="HashCollectionStressTests.cs" />
90-
<Compile Include="HashStressTest.cs" />
91-
<Compile Include="LongRunningRedisPubSubServer.cs" />
92-
<Compile Include="Program.cs" />
93-
<Compile Include="Properties\AssemblyInfo.cs" />
94-
<Compile Include="LocalRedisSentinelFailoverTests.cs" />
95-
<Compile Include="RedisSentinelFailoverTests.cs" />
96-
</ItemGroup>
97-
<ItemGroup>
98-
<ProjectReference Include="..\..\src\ServiceStack.Redis\ServiceStack.Redis.csproj">
99-
<Project>{AF99F19B-4C04-4F58-81EF-B092F1FCC540}</Project>
100-
<Name>ServiceStack.Redis</Name>
101-
</ProjectReference>
102-
</ItemGroup>
103-
<ItemGroup>
104-
<None Include="App.config" />
105-
<None Include="packages.config" />
106-
</ItemGroup>
107-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
108-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
109-
Other similar extension points exist, see Microsoft.Common.targets.
110-
<Target Name="BeforeBuild">
111-
</Target>
112-
<Target Name="AfterBuild">
113-
</Target>
114-
-->
115-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net5.0</TargetFramework>
6+
<RootNamespace>Console.Tests</RootNamespace>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<ProjectReference Include="..\..\src\ServiceStack.Redis\ServiceStack.Redis.csproj" />
15+
</ItemGroup>
16+
17+
</Project>

‎tests/Console.Tests/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎tests/Console.Tests/packages.config

-8
This file was deleted.

0 commit comments

Comments
 (0)