From 05a53c8a3970f22b62ae05904f9b216f74fcd5dd Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Tue, 28 Nov 2023 12:45:04 +0100 Subject: [PATCH] (#157) update demos to Cake 4.0.0 (#158) --- demo/dsl/.config/dotnet-tools.json | 2 +- demo/dsl/build.cake | 2 +- demo/dsl/build.ps1 | 9 +++++++++ demo/dsl/nuget.config | 10 ++++++++++ demo/frosting/build/Build.csproj | 10 +++++++--- 5 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 demo/dsl/nuget.config diff --git a/demo/dsl/.config/dotnet-tools.json b/demo/dsl/.config/dotnet-tools.json index 6cf141eb..da200cda 100644 --- a/demo/dsl/.config/dotnet-tools.json +++ b/demo/dsl/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "1.1.0", + "version": "4.0.0", "commands": [ "dotnet-cake" ] diff --git a/demo/dsl/build.cake b/demo/dsl/build.cake index 910428d8..4d3c7ba9 100644 --- a/demo/dsl/build.cake +++ b/demo/dsl/build.cake @@ -1,4 +1,4 @@ -#module nuget:?package=Cake.BuildSystems.Module&version=3.1.0 +#module nuget://?package=Cake.Buildsystems.Module&prerelease /////////////////////////////////////////////////////////////////////////////// // ARGUMENTS diff --git a/demo/dsl/build.ps1 b/demo/dsl/build.ps1 index 21821d29..dba95af0 100644 --- a/demo/dsl/build.ps1 +++ b/demo/dsl/build.ps1 @@ -6,6 +6,15 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1' $env:DOTNET_CLI_TELEMETRY_OPTOUT = '1' $env:DOTNET_NOLOGO = '1' +# make sure we always get a fresh nuget-package and nothing from cache! +dotnet nuget locals all --clear + +@("./tools", "./.cake") | % { + if(Test-Path $_) { + rm -Force -Recurse $_ + } +} + dotnet tool restore if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } diff --git a/demo/dsl/nuget.config b/demo/dsl/nuget.config new file mode 100644 index 00000000..f177e160 --- /dev/null +++ b/demo/dsl/nuget.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj index a28a0100..30785c03 100644 --- a/demo/frosting/build/Build.csproj +++ b/demo/frosting/build/Build.csproj @@ -1,12 +1,16 @@ Exe - netcoreapp3.1 + net6.0 $(MSBuildProjectDirectory) - - + + + + + +