From db52a3129afd0bee6cf98e563cf8ebc16d233d2c Mon Sep 17 00:00:00 2001 From: Coop56 <168976+Coop56@users.noreply.github.com> Date: Sun, 19 Jul 2026 13:37:15 -0400 Subject: [PATCH 1/4] Finish .NET 10 version upgrades --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dotnetcore.yml | 2 +- .github/workflows/publish.yml | 2 +- Directory.Packages.props | 24 +++++++++---------- docker-compose.yml | 2 +- global.json | 2 +- .../DevBetterWeb.Core.csproj | 4 ++-- .../DevBetterWeb.Infrastructure.csproj | 4 ++-- src/DevBetterWeb.Web/DevBetterWeb.Web.csproj | 6 ++--- .../DevBetterWeb.FunctionalTests.csproj | 4 ++-- .../DevBetterWeb.Tests.csproj | 4 ++-- .../DevBetterWeb.UnitTests.csproj | 2 +- 12 files changed, 28 insertions(+), 30 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cfb4f4f79..ae088a99c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,7 +18,7 @@ jobs: - name: Install .NET 9 uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Initialize CodeQL id: init_codeql diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 9f70a8bf9..9094f5e59 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v5 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' include-prerelease: true - name: Build and Test with dotnet run: dotnet test DevBetterWeb.slnx --filter FullyQualifiedName!~Vimeo.Tests --configuration Release diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f8722e411..45fad659d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET 9 SDK uses: actions/setup-dotnet@v5 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Restore dependencies run: dotnet restore DevBetterWeb.slnx diff --git a/Directory.Packages.props b/Directory.Packages.props index 9fe36bcfb..131c5e360 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -44,26 +44,26 @@ - - - - - - - + + + + + + + - - - + + + - + - + diff --git a/docker-compose.yml b/docker-compose.yml index 41c67be37..fc67e1d03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ depends_on: - database ports: - - 80:80 + - 80:8080 build: context: . dockerfile: Dockerfile diff --git a/global.json b/global.json index 9ff1a348c..8c3f2d6e3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.*", + "version": "10.*", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj b/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj index 4427bfd05..7d0eeeeb2 100644 --- a/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj +++ b/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj @@ -1,7 +1,7 @@ - + - net9.0 + net10.0 DevBetterWeb.Core DevBetterWeb.Core latest diff --git a/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj b/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj index 5cb794017..9f102ec97 100644 --- a/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj +++ b/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj @@ -1,6 +1,6 @@ - + - net9.0 + net10.0 DevBetterWeb.Infrastructure DevBetterWeb.Infrastructure latest diff --git a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj index 6844fd9ea..9a0b6c456 100644 --- a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj +++ b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj @@ -1,6 +1,6 @@ - + - net9.0 + net10.0 true DevBetterWeb.Web Exe @@ -27,9 +27,7 @@ - - diff --git a/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj b/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj index b207585a6..3f7218fd3 100644 --- a/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj +++ b/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj @@ -1,7 +1,7 @@ - + - net9.0 + net10.0 false diff --git a/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj b/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj index 7e257059b..ee26f188b 100644 --- a/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj +++ b/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj @@ -1,6 +1,6 @@ - + - net9.0 + net10.0 true latest enable diff --git a/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj b/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj index a61b30cfb..066749cb6 100644 --- a/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj +++ b/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable false From 27a72493b4cd9d7ac73a83a6551d79b02a14d58b Mon Sep 17 00:00:00 2001 From: Coop56 <168976+Coop56@users.noreply.github.com> Date: Sun, 19 Jul 2026 13:49:25 -0400 Subject: [PATCH 2/4] Update workflow steps to say .NET 10 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ae088a99c..91d1c7058 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -15,7 +15,7 @@ jobs: id: checkout_repo uses: actions/checkout@v6 - - name: Install .NET 9 + - name: Install .NET 10 uses: actions/setup-dotnet@v5 with: dotnet-version: 10.0.x diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 45fad659d..708c3d9cd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v6 - - name: Setup .NET 9 SDK + - name: Setup .NET 10 SDK uses: actions/setup-dotnet@v5 with: dotnet-version: '10.0.x' From a7049aca94fa8065af83d716d665cd70697e20c6 Mon Sep 17 00:00:00 2001 From: Coop56 <168976+Coop56@users.noreply.github.com> Date: Sun, 19 Jul 2026 13:54:06 -0400 Subject: [PATCH 3/4] Update README and VSCode launch.json --- .vscode/launch.json | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b81aab9c7..433eb2808 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/src/DevBetterWeb.Web/bin/Debug/net6.0/DevBetterWeb.Web.dll", + "program": "${workspaceFolder}/src/DevBetterWeb.Web/bin/Debug/net10.0/DevBetterWeb.Web.dll", "args": [], "cwd": "${workspaceFolder}/src/DevBetterWeb.Web", "stopAtEntry": false, diff --git a/README.md b/README.md index fb7568b90..66c425029 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Head over to [devBetter.com](https://devbetter.com) to see the live site. Scroll ### Prerequisite -- [.NET 7 SDK](https://dotnet.microsoft.com/en-us/download) +- [.NET 10 SDK](https://dotnet.microsoft.com/en-us/download) - [The command-line interface (CLI) tools for Entity Framework Core](https://docs.microsoft.com/en-us/ef/core/cli/dotnet) ### Building and Running the App Locally From 8a5743ffca2a650235d1ae595ab38428f016fbaa Mon Sep 17 00:00:00 2001 From: Coop56 <168976+Coop56@users.noreply.github.com> Date: Sun, 19 Jul 2026 13:59:08 -0400 Subject: [PATCH 4/4] Bump package versions --- Directory.Packages.props | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 131c5e360..a21c79dae 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -44,26 +44,25 @@ - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + -