From a7890593012aeef63f5c955d636597350612b16b Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sat, 18 Nov 2023 23:54:36 +0100 Subject: [PATCH 1/4] (GH-184) Updated Cake tool to version 4.0.0 --- .github/workflows/build.yml | 12 +++++------- global.json | 2 +- src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj | 6 +++--- src/Cake.Bakery/Cake.Bakery.csproj | 8 ++++---- src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj | 10 +++++----- .../Cake.Scripting.Transport.Tests.csproj | 6 +++--- .../Cake.Scripting.Transport.csproj | 2 +- src/Cake.Scripting/Cake.Scripting.csproj | 7 ++++--- .../Reflection/ReferenceAssemblyResolver.cs | 4 +++- .../integration/Cake.Bakery.Tests.Integration.csproj | 6 +++--- 10 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 024b1ff..133dd04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,15 +42,13 @@ jobs: with: fetch-depth: 0 - - name: Install .NET SDK 5.0.x + - name: Install .NET SDK 6.0.x - 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: '5.0.x' - - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '6.0.x' + dotnet-version: | + 6.0.x + 7.0.x + 8.0.x - name: Install .NET Core SDK (global.json) uses: actions/setup-dotnet@v3 diff --git a/global.json b/global.json index 2ece999..7d3b56c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.403", + "version": "8.0.100", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj b/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj index b58a241..e340067 100644 --- a/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj +++ b/src/Cake.Bakery.Tests/Cake.Bakery.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true true @@ -14,8 +14,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Bakery/Cake.Bakery.csproj b/src/Cake.Bakery/Cake.Bakery.csproj index 292c3d9..732feba 100644 --- a/src/Cake.Bakery/Cake.Bakery.csproj +++ b/src/Cake.Bakery/Cake.Bakery.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true false Exe @@ -15,9 +15,9 @@ - - - + + + diff --git a/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj b/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj index dba1537..b21f2c5 100644 --- a/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj +++ b/src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true true @@ -107,12 +107,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj b/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj index a7c71e5..dd132bb 100644 --- a/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj +++ b/src/Cake.Scripting.Transport.Tests/Cake.Scripting.Transport.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true true @@ -28,8 +28,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj b/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj index 3aadfff..bd37abf 100644 --- a/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj +++ b/src/Cake.Scripting.Transport/Cake.Scripting.Transport.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Cake.Scripting/Cake.Scripting.csproj b/src/Cake.Scripting/Cake.Scripting.csproj index b4de1a5..7464a28 100644 --- a/src/Cake.Scripting/Cake.Scripting.csproj +++ b/src/Cake.Scripting/Cake.Scripting.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 true AnyCPU @@ -12,9 +12,10 @@ - - + + + diff --git a/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs b/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs index 2239164..1f23343 100644 --- a/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs +++ b/src/Cake.Scripting/Reflection/ReferenceAssemblyResolver.cs @@ -23,8 +23,10 @@ IEnumerable TryGetReferenceAssemblies() foreach (var reference in #if NET6_0 Basic.Reference.Assemblies.Net60.References.All) -#else +#elif NET7_0 Basic.Reference.Assemblies.Net70.References.All) +#else + Basic.Reference.Assemblies.Net80.References.All) #endif { Assembly assembly; diff --git a/tests/integration/Cake.Bakery.Tests.Integration.csproj b/tests/integration/Cake.Bakery.Tests.Integration.csproj index 3fa09df..ce8b1d7 100644 --- a/tests/integration/Cake.Bakery.Tests.Integration.csproj +++ b/tests/integration/Cake.Bakery.Tests.Integration.csproj @@ -1,11 +1,11 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 Exe - - + + From 813fc6048cf93d80d080e576fdbc115640084044 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Sun, 19 Nov 2023 08:00:24 +0000 Subject: [PATCH 2/4] (build) Update to latest 2.x version of Recipe This should allow for the publishing of Tweets again. --- recipe.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index 16e5c31..c5b0e8e 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:https://api.nuget.org/v3/index.json?package=Cake.Recipe&version=2.2.0 +#load nuget:https://api.nuget.org/v3/index.json?package=Cake.Recipe&version=2.2.1 #tool "dotnet:https://api.nuget.org/v3/index.json?package=sign&version=0.9.1-beta.23530.1&prerelease" #tool nuget:https://api.nuget.org/v3/index.json?package=NuGet.CommandLine&version=5.11.0 From 8b95f0c57bd385112bf7ee5b647568e89e02d847 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Sun, 19 Nov 2023 08:01:13 +0000 Subject: [PATCH 3/4] (build) Remove Gitter environment variables Gitter is no longer a "thing", therefore let's remove the environment variables that are in play, since they are no longer required. --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 133dd04..7b1e472 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,6 @@ jobs: env: GITHUB_PAT: ${{ secrets.GH_TOKEN }} - GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }} - GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }} NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} NUGET_SOURCE: "https://api.nuget.org/v3/index.json" TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }} From 6b9aa47895aac09cd9fcc7906c1c1d087692a53b Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Sun, 19 Nov 2023 08:13:46 +0000 Subject: [PATCH 4/4] (build) Get the build running on Mac No idea why this build.sh hasn't been updated to use the global.json file in the same way that the build.ps1 has, but for now, let's just set the .NET version. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f196892..fda170c 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ # Define varibles SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -DOTNET_VERSION="7.0.100" +DOTNET_VERSION="8.0.100" ########################################################################### # INSTALL .NET CORE CLI