From c482cf57c05588ca8105d0f63e8d3fb1dc4da904 Mon Sep 17 00:00:00 2001
From: dkedzior <dkedzior@parasoft.com>
Date: Mon, 8 Dec 2025 14:53:58 +0100
Subject: [PATCH 1/3] Updated to .NET 10 and .slnx

---
 WebGoat.NET.sln                | 25 -------------------------
 WebGoat.NET.slnx               |  3 +++
 WebGoat.NET/WebGoat.NET.csproj |  2 +-
 3 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 WebGoat.NET.sln
 create mode 100644 WebGoat.NET.slnx

diff --git a/WebGoat.NET.sln b/WebGoat.NET.sln
deleted file mode 100644
index a9c83a3b..00000000
--- a/WebGoat.NET.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.32916.344
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebGoat.NET", "WebGoat.NET\WebGoat.NET.csproj", "{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {873A5B2B-8CCF-43A4-9884-01C38A6F2EA1}
-	EndGlobalSection
-EndGlobal
diff --git a/WebGoat.NET.slnx b/WebGoat.NET.slnx
new file mode 100644
index 00000000..bf7cfc57
--- /dev/null
+++ b/WebGoat.NET.slnx
@@ -0,0 +1,3 @@
+<Solution>
+  <Project Path="WebGoat.NET/WebGoat.NET.csproj" />
+</Solution>
diff --git a/WebGoat.NET/WebGoat.NET.csproj b/WebGoat.NET/WebGoat.NET.csproj
index 97853b58..5f382162 100644
--- a/WebGoat.NET/WebGoat.NET.csproj
+++ b/WebGoat.NET/WebGoat.NET.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UserSecretsId>669676e4-410e-47bc-a260-8c851a25b590</UserSecretsId>
     <GenerateProgramFile>false</GenerateProgramFile>

From 1f0c04bafa2b6858ded08d016a1c6c2dd368766e Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Tue, 3 Feb 2026 18:09:05 +0100
Subject: [PATCH 2/3] Upgrade .NET SDK and ASP.NET base images to 10.0

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ee7e9a02..3208d0cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # https://hub.docker.com/_/microsoft-dotnet
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR ./sources
 
 # copy everything else and build app
@@ -8,7 +8,7 @@ WORKDIR ./sources/WebGoat.NET
 RUN dotnet publish -c release -o /app 
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:10.0
 WORKDIR /app
 COPY --from=build /app ./
 

From 3764320bab03557f08032f03711f0d708e38ce05 Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Tue, 3 Feb 2026 18:10:26 +0100
Subject: [PATCH 3/3] Update workflow name to build .NET 10

---
 .github/workflows/dotnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 1abd4eec..e4aee28d 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -1,4 +1,4 @@
-name: build .NET 8
+name: build .NET 10
 
 on:
   push: