From e522e060d1d1496eb0ba042bb0c7f43f1873f189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:01:55 +0100 Subject: [PATCH 01/10] Moving CI workflows to the released .NET 8 version --- .github/workflows/functional_all_db.yml | 10 +++++----- .github/workflows/pr_ci.yml | 2 +- .github/workflows/preview_ci.yml | 2 +- .github/workflows/release_ci.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index 62c7da326fe..ce08fc7dd88 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -17,7 +17,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - uses: actions/setup-node@v3 with: node-version: "15" @@ -43,7 +43,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional @@ -84,7 +84,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional @@ -121,7 +121,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional @@ -157,7 +157,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 594d199a6f0..37abde8f9f2 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -23,7 +23,7 @@ jobs: node-version: "15" - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Build run: | dotnet build -c Release -f net8.0 diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index 2ba6bd332a8..17117e25fa8 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -24,7 +24,7 @@ jobs: node-version: "15" - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Set build number if: matrix.os == 'ubuntu-latest' run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index 33117ee42c9..dc319a9f5a0 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -35,7 +35,7 @@ jobs: node-version: "15" - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Set build number if: matrix.os == 'ubuntu-latest' run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV From fc0c94a06926800d50a8987881fd399dd04e6640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:06:26 +0100 Subject: [PATCH 02/10] Removing .NET 6/7 support --- src/OrchardCore.Build/Dependencies.AspNetCore.props | 12 +----------- src/docs/guides/decoupled-cms/README.md | 2 +- .../cypress-commands/dist/test-runner.js | 4 ++-- .../cypress-commands/dist/test-runner.mjs | 4 ++-- .../cypress-commands/src/test-runner.js | 4 ++-- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props index 9d6f4614819..4e2ed621ca2 100644 --- a/src/OrchardCore.Build/Dependencies.AspNetCore.props +++ b/src/OrchardCore.Build/Dependencies.AspNetCore.props @@ -9,7 +9,7 @@ - net8.0;net7.0;net6.0 + net8.0 @@ -24,16 +24,6 @@ 8.0.0 - - 7.0.14 - 7.0.14 - - - - 6.0.25 - 6.0.25 - - diff --git a/src/docs/guides/decoupled-cms/README.md b/src/docs/guides/decoupled-cms/README.md index 56a1f1d5360..0921f0542c2 100644 --- a/src/docs/guides/decoupled-cms/README.md +++ b/src/docs/guides/decoupled-cms/README.md @@ -59,7 +59,7 @@ The newly created website should be able to run, and look like this: ```xml - net6.0 + net8.0 ``` diff --git a/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.js b/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.js index 2ceacead2d0..0d3d13fa997 100644 --- a/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.js +++ b/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.js @@ -42,7 +42,7 @@ function copyMigrationsRecipeFile(dir) { } // Host the dotnet application, does not rebuild -function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7.0' }={}) { +function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net8.0' }={}) { if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) { global.log("Application already built, skipping build"); } else { @@ -74,7 +74,7 @@ function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7 } // combines the functions above, useful when triggering tests from CI -function e2e(dir, assembly, { dotnetVersion='net7.0' }={}) { +function e2e(dir, assembly, { dotnetVersion='net8.0' }={}) { copyMigrationsRecipeFile(dir); deleteDirectory(path.join(dir, "App_Data_Tests")); var server = host(dir, assembly, { appDataLocation: "./App_Data_Tests", dotnetVersion }); diff --git a/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.mjs b/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.mjs index 0854db29c02..f5b33d6b5f5 100644 --- a/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.mjs +++ b/test/OrchardCore.Tests.Functional/cypress-commands/dist/test-runner.mjs @@ -21,7 +21,7 @@ function deleteDirectory(dir) { } // Host the dotnet application, does not rebuild -function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7.0' }={}) { +function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net8.0' }={}) { if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) { global.log("Application already built, skipping build"); } else { @@ -53,7 +53,7 @@ function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7 } // combines the functions above, useful when triggering tests from CI -function e2e(dir, assembly, { dotnetVersion='net7.0' }={}) { +function e2e(dir, assembly, { dotnetVersion='net8.0' }={}) { deleteDirectory(path.join(dir, "App_Data_Tests")); var server = host(dir, assembly, { appDataLocation: "./App_Data_Tests", dotnetVersion }); diff --git a/test/OrchardCore.Tests.Functional/cypress-commands/src/test-runner.js b/test/OrchardCore.Tests.Functional/cypress-commands/src/test-runner.js index 97c7e28463e..cba4da873f4 100644 --- a/test/OrchardCore.Tests.Functional/cypress-commands/src/test-runner.js +++ b/test/OrchardCore.Tests.Functional/cypress-commands/src/test-runner.js @@ -21,7 +21,7 @@ export function deleteDirectory(dir) { } // Host the dotnet application, does not rebuild -export function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7.0' }={}) { +export function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net8.0' }={}) { if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) { global.log("Application already built, skipping build"); } else { @@ -53,7 +53,7 @@ export function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersio } // combines the functions above, useful when triggering tests from CI -export function e2e(dir, assembly, { dotnetVersion='net7.0' }={}) { +export function e2e(dir, assembly, { dotnetVersion='net8.0' }={}) { deleteDirectory(path.join(dir, "App_Data_Tests")); var server = host(dir, assembly, { appDataLocation: "./App_Data_Tests", dotnetVersion }); From a6849230cc39f05be0f7e8c08cb424ef5e2810a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:06:38 +0100 Subject: [PATCH 03/10] Adding .NET support changes to release notes --- src/docs/releases/1.8.0.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/docs/releases/1.8.0.md b/src/docs/releases/1.8.0.md index 956695bc3b8..cea6ed2471a 100644 --- a/src/docs/releases/1.8.0.md +++ b/src/docs/releases/1.8.0.md @@ -4,6 +4,10 @@ Release date: Not yet released ## Breaking Changes +### .NET support + +This release removes support for `net6.0` and `net7.0`. Only `net8.0` is supported. + ### TheAdmin Theme The `TheAdmin` theme was upgraded to Bootstrap 5.3.2. Here is a list of the breaking changes From 00fbcdfcbe4e29f72626cac008c73233a8fce17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:08:55 +0100 Subject: [PATCH 04/10] Temporarily enabling functional tests on push --- .github/workflows/functional_all_db.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index ce08fc7dd88..6afc89ba33f 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -2,6 +2,7 @@ name: Functional Tests - all Databases on: # manual trigger workflow_dispatch: + push: env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true From 239ac9ae7f0ec4d04ae52caa11f4d9a0522a62e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:14:09 +0100 Subject: [PATCH 05/10] YML formatting fix --- .github/workflows/functional_all_db.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index 6afc89ba33f..2fbf98198b3 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -1,8 +1,8 @@ name: Functional Tests - all Databases on: -# manual trigger + # manual trigger workflow_dispatch: - push: + push env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true From 8d139f1e8dff22b31b78fadb8edaea48e5c6ac45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:16:08 +0100 Subject: [PATCH 06/10] Let's run functional tests during PRs too for now --- .github/workflows/functional_all_db.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index 2fbf98198b3..01de8e38bd3 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -1,8 +1,8 @@ name: Functional Tests - all Databases on: + pull_request: # manual trigger workflow_dispatch: - push env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true From 7b856a3b7f3edfb602265165a89dbbea7320fb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:21:50 +0100 Subject: [PATCH 07/10] Removing .NET 6/7 CI builds --- .github/workflows/mac_unit_test_ci.yml | 2 -- .github/workflows/pr_ci.yml | 2 -- .github/workflows/preview_ci.yml | 2 -- .github/workflows/release_ci.yml | 2 -- 4 files changed, 8 deletions(-) diff --git a/.github/workflows/mac_unit_test_ci.yml b/.github/workflows/mac_unit_test_ci.yml index 3af148fab23..eef85ec9c8c 100644 --- a/.github/workflows/mac_unit_test_ci.yml +++ b/.github/workflows/mac_unit_test_ci.yml @@ -14,6 +14,4 @@ jobs: - name: Build and test run: | dotnet build -c Release -f net8.0 - dotnet build -c Release -f net7.0 - dotnet build -c Release -f net6.0 dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 37abde8f9f2..063b97ee242 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -27,8 +27,6 @@ jobs: - name: Build run: | dotnet build -c Release -f net8.0 - dotnet build -c Release -f net7.0 - dotnet build -c Release -f net6.0 - name: Unit Tests run: | dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index 17117e25fa8..c18da00a30c 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -31,8 +31,6 @@ jobs: - name: Build run: | dotnet build -c Release -f net8.0 - dotnet build -c Release -f net7.0 - dotnet build -c Release -f net6.0 - name: Unit Tests run: | dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index dc319a9f5a0..e80a16702cd 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -42,8 +42,6 @@ jobs: - name: Build run: | dotnet build -c Release -f net8.0 -p:Version=${{ steps.get_version.outputs.VERSION }} - dotnet build -c Release -f net7.0 -p:Version=${{ steps.get_version.outputs.VERSION }} - dotnet build -c Release -f net6.0 -p:Version=${{ steps.get_version.outputs.VERSION }} - name: Unit Tests run: | dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj From 34fb105e1016722c913ae1800137402adf7c847c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:30:24 +0100 Subject: [PATCH 08/10] Floating .NET 8.0.x version for CI builds --- .github/workflows/functional_all_db.yml | 10 +++++----- .github/workflows/pr_ci.yml | 2 +- .github/workflows/preview_ci.yml | 2 +- .github/workflows/release_ci.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index 01de8e38bd3..d1e3aa0ce2d 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -18,7 +18,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - uses: actions/setup-node@v3 with: node-version: "15" @@ -44,7 +44,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional @@ -85,7 +85,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional @@ -122,7 +122,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional @@ -158,7 +158,7 @@ jobs: # We need to install dotnet in the docker container. - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Functional Tests run: | cd test/OrchardCore.Tests.Functional diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 063b97ee242..25bc88f5f1d 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -23,7 +23,7 @@ jobs: node-version: "15" - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Build run: | dotnet build -c Release -f net8.0 diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index c18da00a30c..a6793263c5a 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -24,7 +24,7 @@ jobs: node-version: "15" - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Set build number if: matrix.os == 'ubuntu-latest' run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index e80a16702cd..ec3a628ad47 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -35,7 +35,7 @@ jobs: node-version: "15" - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100' + dotnet-version: '8.0.x' - name: Set build number if: matrix.os == 'ubuntu-latest' run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV From 2a360e3dce1a6625b69f82fd8132d93e39c93d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 14 Nov 2023 23:30:45 +0100 Subject: [PATCH 09/10] Removing temporary functional tests workflow trigger --- .github/workflows/functional_all_db.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index d1e3aa0ce2d..a3a5ee9e7f6 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -1,6 +1,5 @@ name: Functional Tests - all Databases on: - pull_request: # manual trigger workflow_dispatch: env: From ada5b1d7cdb0d8456af5c36e7851bb1d5f98e18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Fri, 17 Nov 2023 02:13:12 +0100 Subject: [PATCH 10/10] Re-adding PropertyGroup for targeting a second framework version as a commented sample --- src/OrchardCore.Build/Dependencies.AspNetCore.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props index 4e2ed621ca2..d5679ce059e 100644 --- a/src/OrchardCore.Build/Dependencies.AspNetCore.props +++ b/src/OrchardCore.Build/Dependencies.AspNetCore.props @@ -24,6 +24,13 @@ 8.0.0 + + +