Skip to content

Commit 0141fd1

Browse files
devleaddevlead
authored
Merge pull request #179 from devlead/feature/gh-178
GH178: Updated Cake Tool to version 3.1.0
2 parents 59a2f91 + a5fded2 commit 0141fd1

File tree

9 files changed

+47
-30
lines changed

9 files changed

+47
-30
lines changed

‎.github/workflows/build.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,15 @@ jobs:
3434
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3535
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
3636
steps:
37-
- name: Checkout the repository
38-
uses: actions/checkout@v2
37+
- name: Get the sources
38+
uses: actions/checkout@v3
39+
with:
40+
fetch-depth: 0
3941

40-
- name: Fetch all tags and branches
41-
run: git fetch --prune --unshallow
42+
- name: Install .NET SDK 5.0.x
43+
uses: actions/setup-dotnet@v3
44+
with:
45+
dotnet-version: '5.0.x'
4246

4347
- name: Install .NET SDK 6.0.x
4448
uses: actions/setup-dotnet@v3
@@ -47,6 +51,8 @@ jobs:
4751

4852
- name: Install .NET Core SDK (global.json)
4953
uses: actions/setup-dotnet@v3
54+
with:
55+
global-json-file: global.json
5056

5157
- name: Cache Tools
5258
uses: actions/cache@v2

‎.github/workflows/posixbuild.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,25 @@ jobs:
1515
os: [macos-latest]
1616

1717
steps:
18-
- name: Checkout the repository
19-
uses: actions/checkout@v2
18+
- name: Get the sources
19+
uses: actions/checkout@v3
20+
with:
21+
fetch-depth: 0
2022

21-
- name: Fetch all tags and branches
22-
run: git fetch --prune --unshallow
23+
- name: Install .NET SDK 5.0.x
24+
uses: actions/setup-dotnet@v3
25+
with:
26+
dotnet-version: '5.0.x'
27+
28+
- name: Install .NET SDK 6.0.x
29+
uses: actions/setup-dotnet@v3
30+
with:
31+
dotnet-version: '6.0.x'
2332

2433
- name: Install .NET Core SDK (global.json)
25-
uses: actions/setup-dotnet@v1
34+
uses: actions/setup-dotnet@v3
35+
with:
36+
global-json-file: global.json
2637

2738
- name: Cache Tools
2839
uses: actions/cache@v2

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.100",
3+
"version": "7.0.305",
44
"rollForward": "latestFeature"
55
}
66
}

‎src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<Import Project="..\Shared.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
17+
<PackageReference Include="xunit" Version="2.5.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>

‎src/Cake.Bakery/Cake.Bakery.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<InternalsVisibleTo Include="Cake.Bakery.Tests" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Cake.Core" Version="3.0.0" />
19-
<PackageReference Include="Cake.NuGet" Version="3.0.0" />
18+
<PackageReference Include="Cake.Core" Version="3.1.0" />
19+
<PackageReference Include="Cake.NuGet" Version="3.1.0" />
2020
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
2121
</ItemGroup>
2222
<ItemGroup>

‎src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@
107107
</ItemGroup>
108108

109109
<ItemGroup>
110-
<PackageReference Include="Cake.Core" Version="3.0.0" />
111-
<PackageReference Include="Cake.Testing" Version="3.0.0" />
112-
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
113-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
114-
<PackageReference Include="xunit" Version="2.4.2" />
115-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
110+
<PackageReference Include="Cake.Core" Version="3.1.0" />
111+
<PackageReference Include="Cake.Testing" Version="3.1.0" />
112+
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
113+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
114+
<PackageReference Include="xunit" Version="2.5.0" />
115+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
116116
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
117117
<PrivateAssets>all</PrivateAssets>
118118
</PackageReference>

‎src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
31-
<PackageReference Include="xunit" Version="2.4.2" />
32-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
31+
<PackageReference Include="xunit" Version="2.5.0" />
32+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
<PrivateAssets>all</PrivateAssets>
3535
</PackageReference>

‎src/Cake.Scripting/Cake.Scripting.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<InternalsVisibleTo Include="Cake.Scripting.Tests" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="3.0.0" />
16-
<PackageReference Include="Cake.Common" Version="3.0.0" />
17-
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
18-
<PackageReference Include="Basic.Reference.Assemblies.Net70" Version="1.4.1" Condition="'$(TargetFramework)' == 'net7.0'" />
19-
<PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.4.1" Condition="'$(TargetFramework)' == 'net6.0'" />
15+
<PackageReference Include="Cake.Core" Version="3.1.0" />
16+
<PackageReference Include="Cake.Common" Version="3.1.0" />
17+
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
18+
<PackageReference Include="Basic.Reference.Assemblies.Net70" Version="1.4.2" Condition="'$(TargetFramework)' == 'net7.0'" />
19+
<PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.4.2" Condition="'$(TargetFramework)' == 'net6.0'" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<ProjectReference Include="..\Cake.Scripting.Abstractions\Cake.Scripting.Abstractions.csproj" />

‎tests/integration/Cake.Bakery.Tests.Integration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Xunit.Assert" Version="2.4.2" />
7+
<PackageReference Include="Xunit.Assert" Version="2.5.0" />
88
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
99
</ItemGroup>
1010
<ItemGroup>

0 commit comments

Comments
 (0)