From b537f67466b914174a8aee6f2e104d0d61366316 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 08:56:34 +0100 Subject: [PATCH 1/8] Upgraded project and E2E tests to dotnet 10 --- .github/workflows/deploy.yml | 4 ++-- src/Berufsschule_HAM.csproj | 2 +- .../Berufsschule_HAM.E2ETests.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index db25c97..a7b493d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,7 @@ name: Build & Deploy on: push: - branches: [ main ] + branches: [ 316-upgrade-to-dotnet-10 ] jobs: build: @@ -15,7 +15,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: Restore dependencies run: dotnet restore src/ diff --git a/src/Berufsschule_HAM.csproj b/src/Berufsschule_HAM.csproj index 10e8609..67a08dd 100644 --- a/src/Berufsschule_HAM.csproj +++ b/src/Berufsschule_HAM.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable enable diff --git a/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj b/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj index e4ad4ef..4181653 100644 --- a/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj +++ b/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable enable false From b35008d35f972c43cb2c5545ae1790d23ebaf5d2 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 09:00:36 +0100 Subject: [PATCH 2/8] Fixed wrong yaml changed --- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a7b493d..d1c260c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,7 @@ name: Build & Deploy on: push: - branches: [ 316-upgrade-to-dotnet-10 ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 865f4e7..8b65afa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: E2E Tests on: push: - branches: [ "main", "test/**" ] + branches: [ "main", "test/**", "316-upgrade-to-dotnet-10" ] workflow_dispatch: jobs: @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: Install Chromium and ChromeDriver run: | From c60e7ce6d5496db9b16136ea0be0d3ef2d51eaf3 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 13:58:53 +0100 Subject: [PATCH 3/8] Fixed E2E CI issue --- tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs index c488b92..8ef7648 100644 --- a/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs +++ b/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs @@ -63,6 +63,7 @@ public static class AssetsHelper driver.FindElement(By.Id("updateModel")).SendKeys(AppHelper.GetRandomName()); driver.ExecuteJavaScript("document.getElementById(\"addAttributeBtn\").click()"); + AppHelper.AwaitVisible(driver, By.CssSelector("#updateAttributesContainer input[data-attr-name]")); driver.FindElement(By.CssSelector("#updateAttributesContainer input[data-attr-name]")).SendKeys(AppHelper.GetRandomName()); driver.FindElement(By.CssSelector("#updateAttributesContainer input[data-attr-value]")).SendKeys(AppHelper.GetRandomName()); From 9c90a55aac96c1c15e467e5cd9f715a399ab38f1 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 14:09:18 +0100 Subject: [PATCH 4/8] Removed extra branch from test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b65afa..19e1e38 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: E2E Tests on: push: - branches: [ "main", "test/**", "316-upgrade-to-dotnet-10" ] + branches: [ "main", "test/**"] workflow_dispatch: jobs: From 3e770bdf34344f6d485357185b0f1280142140ce Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 16:18:53 +0100 Subject: [PATCH 5/8] Added RollForward to accomodate dotnet 10 release candidate versions --- src/Berufsschule_HAM.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Berufsschule_HAM.csproj b/src/Berufsschule_HAM.csproj index 67a08dd..4b85586 100644 --- a/src/Berufsschule_HAM.csproj +++ b/src/Berufsschule_HAM.csproj @@ -1,6 +1,7 @@ net10.0 + LatestMajor enable enable From 272246aa92733c96dbf413c8f8d11603988b0c43 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 23:07:42 +0100 Subject: [PATCH 6/8] Updated E2E tests packages, removed RollForward --- src/Berufsschule_HAM.csproj | 1 - .../Berufsschule_HAM.E2ETests.csproj | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Berufsschule_HAM.csproj b/src/Berufsschule_HAM.csproj index 4b85586..67a08dd 100644 --- a/src/Berufsschule_HAM.csproj +++ b/src/Berufsschule_HAM.csproj @@ -1,7 +1,6 @@ net10.0 - LatestMajor enable enable diff --git a/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj b/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj index 4181653..e90950f 100644 --- a/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj +++ b/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj @@ -6,13 +6,13 @@ false - + - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive From 4e664029ff8280dd4d4cdd90d214f655bbdc5288 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 23:11:28 +0100 Subject: [PATCH 7/8] Added note to Development.md regarding E2E tests --- docs/Development.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/Development.md b/docs/Development.md index bf978bd..0255149 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -74,4 +74,8 @@ Currently there are two environments 7. Do `git commit -m "MESSAGE"` or press the big blue "Commit" button (VSCode) 8. Do `git push` (in the "GRAPH" section there are a few buttons, one of which has an upward facing arrow and the mouseover text "Push"; use this one.) 9. After committing and pushing your changes, create a pull request in GitHub. (optional: Assign @LD-Reborn for code review.) -10. Once there are no requested changes / the review is approved, merge the branch. If you encounter merge conflicts, contact @LD-Reborn. \ No newline at end of file +10. Once there are no requested changes / the review is approved, merge the branch. If you encounter merge conflicts, contact @LD-Reborn. + +# How to perform E2E tests +1. `cd tests/Berufsschule_HAM.E2ETests` +2. `dotnet build && dotnet test` \ No newline at end of file From 13a99c184e027f4e043a91fd5beadbb88a0fb354 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Wed, 19 Nov 2025 23:15:01 +0100 Subject: [PATCH 8/8] Updated Swashbuckle and ImageSharp --- src/Berufsschule_HAM.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Berufsschule_HAM.csproj b/src/Berufsschule_HAM.csproj index 67a08dd..78b07bb 100644 --- a/src/Berufsschule_HAM.csproj +++ b/src/Berufsschule_HAM.csproj @@ -9,9 +9,9 @@ - - - - + + + + \ No newline at end of file