From ea2063227ad54562dce06c07226f3e141f58e5b0 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sat, 18 Nov 2023 23:16:50 +0100 Subject: [PATCH 1/4] (build) Updated Cake Tool to version 4.0.0 --- .config/dotnet-tools.json | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 831d039..da200cd 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "3.0.0", + "version": "4.0.0", "commands": [ "dotnet-cake" ] diff --git a/global.json b/global.json index 7957b84..537e157 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.402", + "version": "8.0.100", "rollForward": "latestFeature", "allowPrerelease": false } From bdeb238ca78210a79ca908c023a1c5b469b3a8ad Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sat, 18 Nov 2023 23:30:55 +0100 Subject: [PATCH 2/4] Add .NET 8 SDKs --- .github/workflows/BuildGitHubAgentsUbuntuLatest.yml | 2 +- .github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml | 2 +- .github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml | 2 +- .github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml | 2 +- .github/workflows/BuildGitHubAgentsWin2022.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml index c8158f0..0fc4967 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: ['6.0', '7.0'] + sdk: ['6.0', '7.0', '8.0'] steps: - if: github.ref == 'refs/heads/main' name: Login to DockerHub diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml index b03b6c8..d2cc131 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: ['6.0', '7.0'] + sdk: ['6.0', '7.0', '8.0'] steps: - if: github.ref == 'refs/heads/main' name: Login to DockerHub diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml index 003cce7..0b0462f 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: ['6.0', '7.0'] + sdk: ['6.0', '7.0', '8.0'] steps: - if: github.ref == 'refs/heads/main' name: Login to DockerHub diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml index 91bfeab..733098f 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: ['6.0', '7.0'] + sdk: ['6.0', '7.0', '8.0'] steps: - if: github.ref == 'refs/heads/main' name: Login to DockerHub diff --git a/.github/workflows/BuildGitHubAgentsWin2022.yml b/.github/workflows/BuildGitHubAgentsWin2022.yml index fb88b72..98de89c 100644 --- a/.github/workflows/BuildGitHubAgentsWin2022.yml +++ b/.github/workflows/BuildGitHubAgentsWin2022.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [windows-2022] - sdk: ['6.0', '7.0'] + sdk: ['6.0', '7.0', '8.0'] steps: - if: github.ref == 'refs/heads/main' name: Login to DockerHub From 6993dc6d272b3361a94ec92f5bbdca172dfc0fb4 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sat, 18 Nov 2023 23:43:03 +0100 Subject: [PATCH 3/4] Don't filtet out .NET 8 --- build/models/docker.cake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/models/docker.cake b/build/models/docker.cake index 0a992d9..0e8a175 100644 --- a/build/models/docker.cake +++ b/build/models/docker.cake @@ -15,13 +15,13 @@ public record BaseImage(string Repo, string Tag, string CakePrefix) public string CakeImage { get; } = $"cakebuild/cake:{CakePrefix}{Tag}"; public bool LinuxContainer { get; } = Tag switch { - "3.1" => true, "6.0" => true, "7.0" => true, + "8.0" => true, string => ( - Tag.StartsWith("3.1-") - || Tag.StartsWith("6.0-") + Tag.StartsWith("6.0-") || Tag.StartsWith("7.0-") + || Tag.StartsWith("8.0-") ) && ( !( @@ -33,9 +33,9 @@ public record BaseImage(string Repo, string Tag, string CakePrefix) }; public bool WindowsContainer { get; } = Tag switch { string => ( - Tag.StartsWith("3.1-") - || Tag.StartsWith("6.0-") + Tag.StartsWith("6.0-") || Tag.StartsWith("7.0-") + || Tag.StartsWith("8.0-") ) && ( ( From 13392a13d1d2f258b0fc62011fba40244348f804 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sun, 19 Nov 2023 00:04:51 +0100 Subject: [PATCH 4/4] Update Cake Action --- .github/workflows/BuildGitHubAgentsUbuntuLatest.yml | 2 +- .github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml | 2 +- .github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml | 2 +- .github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml | 2 +- .github/workflows/BuildGitHubAgentsWin2019.yml | 2 +- .github/workflows/BuildGitHubAgentsWin2022.yml | 2 +- .github/workflows/BuildSelfHostedAgent.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml index 0fc4967..9091d8a 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-dotnet@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml index d2cc131..7178073 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-dotnet@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml index 0b0462f..f645a5b 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-dotnet@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml index 733098f..39ba2a3 100644 --- a/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml +++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-dotnet@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/BuildGitHubAgentsWin2019.yml b/.github/workflows/BuildGitHubAgentsWin2019.yml index 589ba81..e5e47c9 100644 --- a/.github/workflows/BuildGitHubAgentsWin2019.yml +++ b/.github/workflows/BuildGitHubAgentsWin2019.yml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-dotnet@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/BuildGitHubAgentsWin2022.yml b/.github/workflows/BuildGitHubAgentsWin2022.yml index 98de89c..d833af4 100644 --- a/.github/workflows/BuildGitHubAgentsWin2022.yml +++ b/.github/workflows/BuildGitHubAgentsWin2022.yml @@ -34,7 +34,7 @@ jobs: uses: actions/setup-dotnet@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/BuildSelfHostedAgent.yml b/.github/workflows/BuildSelfHostedAgent.yml index 6bedd55..84741b8 100644 --- a/.github/workflows/BuildSelfHostedAgent.yml +++ b/.github/workflows/BuildSelfHostedAgent.yml @@ -52,7 +52,7 @@ jobs: uses: actions/checkout@v3 - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GITHUB_TOKEN: ${{ github.token }} with: