Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 73eae9c

Browse files
updating to netcoreapp2.1
1 parent a16e9b0 commit 73eae9c

8 files changed

Lines changed: 24 additions & 32 deletions

File tree

build.cake

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,9 @@ Task("RunTests")
3636
{
3737
var testProjects = new string[] { "SqlStreamStore.HAL.Tests" };
3838

39-
foreach(var testProject in testProjects) {
40-
var projectDir = srcDir + Directory(testProject);
41-
StartProcess("dotnet", new ProcessSettings {
42-
Arguments = $"xunit -quiet -parallel all -configuration {configuration} -nobuild",
43-
WorkingDirectory = projectDir
44-
});
45-
}
39+
Parallel.Invoke(new ParallelOptions {
40+
41+
}, Array.ConvertAll(testProjects, RunTest));
4642
});
4743

4844
Task("Publish")
@@ -74,4 +70,9 @@ Task("Default")
7470
.IsDependentOn("RunTests")
7571
.IsDependentOn("NuGetPack");
7672

77-
RunTarget(target);
73+
RunTarget(target);
74+
75+
Action RunTest(string testProject) => () => DotNetCoreTest(srcDir + Directory(testProject), new DotNetCoreTestSettings {
76+
NoBuild = true,
77+
NoRestore = true
78+
});

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $proj = @"
5555
##########################
5656
# Install .NET Core CLI
5757
##########################
58-
$dotNetCoreVersion = "2.0.0"
58+
$dotNetCoreVersion = "2.1.301"
5959
$dotNetInstallerUri = "https://dot.net/dotnet-install.ps1"
6060
Function Remove-PathVariable([string]$variableToRemove)
6161
{

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fi
2121
###########################################################################
2222
# Install .NET Core CLI
2323
###########################################################################
24-
curl -sSL https://dot.net/dotnet-install.sh | bash /dev/stdin --channel current --version 2.0.0 --install-dir $DOTNET_INSTALL_PATH
24+
curl -sSL https://dot.net/dotnet-install.sh | bash /dev/stdin --channel current --version 2.1.301 --install-dir $DOTNET_INSTALL_PATH
2525

2626
###########################################################################
2727
# INSTALL CAKE

global.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/SqlStreamStore.HAL.DevServer/SqlStreamStore.HAL.DevServer.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<LangVersion>7.1</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.2" />
9-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.2" />
10-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.2" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.2" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.0.2" />
8+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
9+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
13+
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
14+
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1315
</ItemGroup>
1416
<ItemGroup>
1517
<ProjectReference Include="..\SqlStreamStore.HAL\SqlStreamStore.HAL.csproj" />

src/SqlStreamStore.HAL.Tests/SqlStreamStore.HAL.Tests.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
44
<AssemblyName>SqlStreamStore.HAL.Tests</AssemblyName>
55
<PackageId>SqlStreamStore.HAL.Tests</PackageId>
66
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -18,12 +18,11 @@
1818
<ProjectReference Include="..\SqlStreamStore.HAL\SqlStreamStore.HAL.csproj" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.2" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
23-
<PackageReference Include="Shouldly" Version="2.8.2" />
21+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
23+
<PackageReference Include="Shouldly" Version="3.0.0" />
2424
<PackageReference Include="xunit" Version="2.3.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
2626
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
27-
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
2827
</ItemGroup>
2928
</Project>

src/SqlStreamStore.HAL/SqlStreamStore.HAL.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="Halcyon" Version="2.5.1" />
1010
<PackageReference Include="LibLog" Version="5.0.0" PrivateAssets="All" />
11-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.3" />
11+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
1212
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1313
<PackageReference Include="SqlStreamStore" Version="1.1.2" />
1414
</ItemGroup>

src/global.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)