Skip to content
This repository has been archived by the owner on Nov 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'devlead-feature/gh-110' into develop
Browse files Browse the repository at this point in the history
* devlead-feature/gh-110:
  Update to gitVErsion 5.3.7
  Update GitHub action to .NET 3.1.402
  (GH-110) Update to Cake 0.38.5 &.NET 3.1.402 * fixes #110
  • Loading branch information
devlead committed Sep 21, 2020
2 parents caa73a8 + 5877cd4 commit 45d3160
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow

- name: Install .NET Core SDK 3.1.301
- name: Install .NET Core SDK 3.1.402
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.301'
dotnet-version: '3.1.402'

- name: Run Frosting Build
env:
Expand Down
2 changes: 1 addition & 1 deletion build.config
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
DOTNET_VERSION=3.1.301
DOTNET_VERSION=3.1.402
2 changes: 1 addition & 1 deletion build/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="0.38.2" />
<PackageReference Include="Cake.Frosting" Version="0.38.4" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion build/Lifetime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public override void Setup(Context context)
context.Information("Installing .Net Global Tools...");
context.DotNetCoreToolInstall("GitReleaseManager.Tool", "0.11.0", "dotnet-gitreleasemanager");
context.DotNetCoreToolInstall("SignClient", "1.2.109", "SignClient");
context.DotNetCoreToolInstall("GitVersion.Tool", "5.1.2", "dotnet-gitversion");
context.DotNetCoreToolInstall("GitVersion.Tool", "5.3.7", "dotnet-gitversion");

// Calculate semantic version.
context.Version = BuildVersion.Calculate(context);
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "3.1.301",
"rollForward": "latestMajor"
"version": "3.1.402",
"rollForward": "latestPatch"
}
}
11 changes: 5 additions & 6 deletions src/Cake.Frosting.Tests/Cake.Frosting.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.6.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.7.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="Castle.Core" Version="4.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
<PackageReference Include="Cake.Testing" Version="0.38.4" />
<PackageReference Include="Cake.Testing" Version="0.38.5" />
</ItemGroup>

<!-- .NET Framework packages -->
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Frosting/Cake.Frosting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<Import Project="$(MSBuildThisFileDirectory)..\Shared.msbuild" />
<ItemGroup>
<PackageReference Include="Cake.Core" Version="0.38.4" />
<PackageReference Include="Cake.Common" Version="0.38.4" />
<PackageReference Include="Cake.Core" Version="0.38.5" />
<PackageReference Include="Cake.Common" Version="0.38.5" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down

0 comments on commit 45d3160

Please sign in to comment.