From f58a2728a4c39e94acd1b8b4fbafe7286126bfc5 Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Thu, 23 Nov 2023 22:18:18 +0100
Subject: [PATCH] (#148) Update Cake.Core to 4.0.0
and CakeContrib.Guidelines to 1.5.1
---
.github/workflows/build.yml | 26 +++++++------------
.github/workflows/codeql-analysis.yml | 21 +++++----------
global.json | 3 +--
.../Cake.AzurePipelines.Module.csproj | 4 +--
.../Cake.BuildSystems.Module.csproj | 2 +-
.../Cake.GitHubActions.Module.csproj | 4 +--
.../Cake.Module.Shared.csproj | 4 +--
.../Cake.MyGet.Module.csproj | 4 +--
.../Cake.TeamCity.Module.csproj | 4 +--
.../Cake.TravisCI.Module.csproj | 4 +--
10 files changed, 31 insertions(+), 45 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89563682..240f7ab7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,28 +43,22 @@ jobs:
WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
steps:
- - name: Checkout the repository
+ - name: Checkout the repository
uses: actions/checkout@v4
-
+
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
+ # codecov and unittests need 2.1, gitversion needs 5.0
- uses: actions/setup-dotnet@v3.2.0
with:
- # codecov and unittests need 2.1
- dotnet-version: '2.1.818'
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '3.1.414'
- - uses: actions/setup-dotnet@v3.2.0
- with:
- # gitversion needs 5.0
- dotnet-version: '5.0.402'
- - uses: actions/setup-dotnet@v3.2.0
- with:
- # need at least .NET 6 to build
- dotnet-version: '6.0.400'
- include-prerelease: true
+ dotnet-version: |
+ 2.1
+ 3.1
+ 5.0
+ 6.0
+ 7.0
+ 8.0
- name: Cache Tools
uses: actions/cache@v3
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d7a5ffd5..78205f2b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,20 +26,13 @@ jobs:
- uses: actions/setup-dotnet@v3.2.0
with:
- # codecov and unittests need 2.1
- dotnet-version: '2.1.818'
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '3.1.414'
- - uses: actions/setup-dotnet@v3.2.0
- with:
- # gitversion needs 5.0
- dotnet-version: '5.0.402'
- - uses: actions/setup-dotnet@v3.2.0
- with:
- # need at least .NET 6 to build
- dotnet-version: '6.0.400'
- include-prerelease: true
+ dotnet-version: |
+ 2.1
+ 3.1
+ 5.0
+ 6.0
+ 7.0
+ 8.0
- name: Cache Tools
uses: actions/cache@v3
diff --git a/global.json b/global.json
index ba45b4fe..7d3b56c9 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,6 @@
{
"sdk": {
- "allowPrerelease": true,
- "version": "6.0.400",
+ "version": "8.0.100",
"rollForward": "latestFeature"
}
}
\ No newline at end of file
diff --git a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj
index 085223c0..bdeaf19c 100644
--- a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj
+++ b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj
@@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj
index a62816b1..55130d22 100644
--- a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj
+++ b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj
@@ -55,7 +55,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="CakeContrib.Guidelines" Version="1.4.0">
+ <PackageReference Include="CakeContrib.Guidelines" Version="1.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj
index 58397c8e..39debb5d 100644
--- a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj
+++ b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj
@@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Cake.Module.Shared/Cake.Module.Shared.csproj b/src/Cake.Module.Shared/Cake.Module.Shared.csproj
index 4cf640ec..a04a0ab0 100644
--- a/src/Cake.Module.Shared/Cake.Module.Shared.csproj
+++ b/src/Cake.Module.Shared/Cake.Module.Shared.csproj
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj
index 6840f2a2..49b22841 100644
--- a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj
+++ b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj
@@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj
index fe4521b9..549758e8 100644
--- a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj
+++ b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj
@@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj
index a86a444c..f462c1f0 100644
--- a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj
+++ b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj
@@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
- <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+ <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>