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

Commit 6c88eb6

Browse files
mythzmythz
committed
Modify tests to also use CI packages
1 parent a204a0d commit 6c88eb6

8 files changed

Lines changed: 71 additions & 53 deletions

File tree

‎NuGet.Config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="ServiceStack CI feed" value="http://build.servicestack.net/guestAuth/app/nuget/v1/FeedService.svc" />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
6+
</packageSources>
7+
</configuration>

‎build/build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<Target Name="UpdateVersion">
5353
<!-- Update Version -->
5454
<ItemGroup>
55-
<RegexTransform Include="$(BuildSolutionDir)/src/Directory.Build.props">
55+
<RegexTransform Include="$(BuildSolutionDir)/src/Directory.Build.props;$(BuildSolutionDir)/tests/Directory.Build.props">
5656
<Find>&lt;Version&gt;[^&lt;]*</Find>
5757
<ReplaceWith>&lt;Version&gt;$(PackageVersion)</ReplaceWith>
5858
</RegexTransform>

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
</PackageDescription>
1212
<PackageTags>Redis;NoSQL;Client;Distributed;Cache;PubSub;Messaging;Transactions</PackageTags>
1313
</PropertyGroup>
14+
<ItemGroup>
15+
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
16+
</ItemGroup>
1417
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
1518
<Reference Include="System.Net" />
16-
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
17-
<Reference Include="..\..\lib\net45\ServiceStack.Text.dll" />
18-
<Reference Include="..\..\lib\net45\ServiceStack.Common.dll" />
19-
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
2019
</ItemGroup>
2120
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2221
<PackageReference Include="System.Net.Security" Version="4.3.2" />
@@ -25,10 +24,6 @@
2524
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
2625
<PackageReference Include="System.Data.Common" Version="4.3.0" />
2726
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
28-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
29-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Text.dll" />
30-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Common.dll" />
31-
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
3227
</ItemGroup>
3328

3429
</Project>

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

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,44 @@
3535
<Prefer32Bit>false</Prefer32Bit>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="ServiceStack">
39-
<HintPath>..\..\lib\net45\ServiceStack.dll</HintPath>
38+
<Reference Include="ServiceStack, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
39+
<HintPath>..\..\src\packages\ServiceStack.5.4.1\lib\net45\ServiceStack.dll</HintPath>
40+
<Private>True</Private>
4041
</Reference>
41-
<Reference Include="ServiceStack.Client">
42-
<HintPath>..\..\lib\net45\ServiceStack.Client.dll</HintPath>
42+
<Reference Include="ServiceStack.Client, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
43+
<HintPath>..\..\src\packages\ServiceStack.Client.5.4.1\lib\net45\ServiceStack.Client.dll</HintPath>
44+
<Private>True</Private>
4345
</Reference>
44-
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\lib\net45\ServiceStack.Common.dll</HintPath>
46+
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
47+
<HintPath>..\..\src\packages\ServiceStack.Common.5.4.1\lib\net45\ServiceStack.Common.dll</HintPath>
48+
<Private>True</Private>
4749
</Reference>
48-
<Reference Include="ServiceStack.Interfaces">
49-
<HintPath>..\..\lib\net45\ServiceStack.Interfaces.dll</HintPath>
50+
<Reference Include="ServiceStack.Interfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
51+
<HintPath>..\..\src\packages\ServiceStack.Interfaces.5.4.1\lib\net45\ServiceStack.Interfaces.dll</HintPath>
52+
<Private>True</Private>
5053
</Reference>
51-
<Reference Include="ServiceStack.Server">
52-
<HintPath>..\..\lib\net45\ServiceStack.Server.dll</HintPath>
53-
</Reference>
54-
<Reference Include="ServiceStack.Text">
55-
<HintPath>..\..\lib\net45\ServiceStack.Text.dll</HintPath>
54+
<Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587">
55+
<HintPath>..\..\src\packages\ServiceStack.Text.5.4.1\lib\net45\ServiceStack.Text.dll</HintPath>
56+
<Private>True</Private>
5657
</Reference>
5758
<Reference Include="System" />
59+
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
60+
<HintPath>..\..\src\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
61+
<Private>True</Private>
62+
</Reference>
5863
<Reference Include="System.Core" />
64+
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
65+
<HintPath>..\..\src\packages\System.Memory.4.5.1\lib\netstandard1.1\System.Memory.dll</HintPath>
66+
<Private>True</Private>
67+
</Reference>
68+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
69+
<HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
70+
<Private>True</Private>
71+
</Reference>
72+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
73+
<HintPath>..\..\src\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
74+
<Private>True</Private>
75+
</Reference>
5976
<Reference Include="System.Xml.Linq" />
6077
<Reference Include="System.Data.DataSetExtensions" />
6178
<Reference Include="Microsoft.CSharp" />
@@ -84,6 +101,7 @@
84101
</ItemGroup>
85102
<ItemGroup>
86103
<None Include="App.config" />
104+
<None Include="packages.config" />
87105
</ItemGroup>
88106
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
89107
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎tests/Console.Tests/packages.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="ServiceStack" version="5.4.1" targetFramework="net45" />
4+
<package id="ServiceStack.Client" version="5.4.1" targetFramework="net45" />
5+
<package id="ServiceStack.Common" version="5.4.1" targetFramework="net45" />
6+
<package id="ServiceStack.Interfaces" version="5.4.1" targetFramework="net45" />
7+
<package id="ServiceStack.Text" version="5.4.1" targetFramework="net45" />
8+
<package id="System.Buffers" version="4.4.0" targetFramework="net45" />
9+
<package id="System.Memory" version="4.5.1" targetFramework="net45" />
10+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net45" />
11+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
12+
</packages>

‎tests/Directory.Build.props‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<Version>5.4.1</Version>
5+
<LangVersion>latest</LangVersion>
6+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
10+
<DefineConstants>DEBUG</DefineConstants>
11+
</PropertyGroup>
12+
13+
</Project>

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
2525
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
2626
<PackageReference Include="NUnit" Version="3.10.1" />
27+
<PackageReference Include="ServiceStack" Version="$(Version)" />
2728
</ItemGroup>
2829

2930
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
@@ -38,24 +39,14 @@
3839
<Reference Include="System.ComponentModel.DataAnnotations" />
3940
<Reference Include="System.Web" />
4041
<Reference Include="Microsoft.CSharp" />
41-
42-
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
43-
<Reference Include="..\..\lib\net45\ServiceStack.Text.dll" />
44-
<Reference Include="..\..\lib\net45\ServiceStack.Common.dll" />
45-
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
46-
</ItemGroup>
42+
</ItemGroup>
4743

4844
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
4945
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
5046
</PropertyGroup>
5147

5248
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
5349
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
54-
55-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
56-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Text.dll" />
57-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Common.dll" />
58-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.dll" />
5950
</ItemGroup>
6051

6152
</Project>

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
2121
<PackageReference Include="NUnit" Version="3.10.1" />
2222
<PackageReference Include="System.Memory" Version="4.5.1" />
23+
<PackageReference Include="ServiceStack" Version="$(Version)" />
2324
</ItemGroup>
2425
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
2526
<DefineConstants>$(DefineConstants);NET45</DefineConstants>
@@ -33,30 +34,11 @@
3334
<Reference Include="System.Web" />
3435
<Reference Include="System.Web.Extensions" />
3536
<Reference Include="Microsoft.CSharp" />
36-
<Reference Include="..\..\lib\net45\ServiceStack.Interfaces.dll" />
37-
<Reference Include="..\..\lib\net45\ServiceStack.Text.dll" />
38-
<Reference Include="..\..\lib\net45\ServiceStack.Common.dll" />
39-
<Reference Include="..\..\lib\net45\ServiceStack.dll" />
4037
</ItemGroup>
4138
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
4239
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
4340
</PropertyGroup>
44-
<!-- Enable NunitLite build, becase NUnit is not supported on .NET Core SDK 1.0.2
45-
https://github.com/nunit/dotnet-test-nunit/issues/91
46-
To enable NUnitLite pass /p:NUNITLITE=1 into msbuild arguments
47-
-->
48-
<PropertyGroup Condition=" '$(NUNITLITE)' != '' ">
49-
<OutputType>Exe</OutputType>
50-
<DefineConstants>$(DefineConstants);NUNITLITE</DefineConstants>
51-
</PropertyGroup>
52-
<ItemGroup Condition=" '$(NUNITLITE)' != '' ">
53-
<PackageReference Include="NUnitLite" Version="3.9.0" />
54-
</ItemGroup>
5541
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
5642
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
57-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Interfaces.dll" />
58-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Text.dll" />
59-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.Common.dll" />
60-
<Reference Include="..\..\lib\netstandard2.0\ServiceStack.dll" />
6143
</ItemGroup>
6244
</Project>

0 commit comments

Comments
 (0)