From 988e977d790c3a2183fc10471b1cca3fa4ad8846 Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Wed, 17 Jan 2024 11:57:57 +0100
Subject: [PATCH 1/5] Update WebGoat.NET.csproj to .NET 8

---
 WebGoat.NET/WebGoat.NET.csproj | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/WebGoat.NET/WebGoat.NET.csproj b/WebGoat.NET/WebGoat.NET.csproj
index 761d4b6..97853b5 100644
--- a/WebGoat.NET/WebGoat.NET.csproj
+++ b/WebGoat.NET/WebGoat.NET.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UserSecretsId>669676e4-410e-47bc-a260-8c851a25b590</UserSecretsId>
+    <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,18 +15,19 @@
 
   <ItemGroup>
     <PackageReference Include="Json.Net" Version="1.0.33" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.8" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.8">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.12" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="7.0.12" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
   </ItemGroup>
 

From 66e86241f31ab2c9e0ded27d7b2dedc111c159ea Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Wed, 17 Jan 2024 12:02:53 +0100
Subject: [PATCH 2/5] Update dotnet.yml

Update build script
---
 .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 98808de..1abd4ee 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -1,4 +1,4 @@
-name: build .NET 7
+name: build .NET 8
 
 on:
   push:

From 7ac7fc77042aaf9fc2daec1b88c49aee60c716c7 Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Wed, 17 Jan 2024 12:03:58 +0100
Subject: [PATCH 3/5] Update Dockerfile to .NET 8 base images

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

diff --git a/Dockerfile b/Dockerfile
index 79a6a91..ee7e9a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # https://hub.docker.com/_/microsoft-dotnet
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.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:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 COPY --from=build /app ./
 

From 193863e80648390bc7cbdbf0bfaf733339d55ff2 Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Wed, 17 Jan 2024 12:15:22 +0100
Subject: [PATCH 4/5] Update readme.md

Update content to .NET 8 context
---
 readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index 0a765ba..6cba364 100644
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,8 @@
-# WebGoat.NET version 0.2
+# WebGoat.NET version 0.3
 
 ## Build status
 
-![build .NET 7](https://github.com/tobyash86/WebGoat.NET/workflows/build%20.NET%207/badge.svg)
+![build .NET 8](https://github.com/tobyash86/WebGoat.NET/workflows/build%20.NET%208/badge.svg)
 
 ## The next generation of the WebGoat example project to demonstrate OWASP TOP 10 vulnerabilities
 
@@ -26,7 +26,7 @@ RUNNING!
    `--disable-xss-auditor`.
 
 ## Requirements
-- .NET 7 SDK
+- .NET 8 SDK
 
 ## How to build and run
 

From 0fc8fd7ec7a6a5f6f7847a27bd8d79cc95060c21 Mon Sep 17 00:00:00 2001
From: tobyash86 <34890669+tobyash86@users.noreply.github.com>
Date: Wed, 17 Jan 2024 12:21:28 +0100
Subject: [PATCH 5/5] Update changelog.md

---
 changelog.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/changelog.md b/changelog.md
index fafccec..2254651 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## Version 0.3
+### Added
+- Added .NET 8 SDK as a minimum requirement to run WebGoat locally.
+- Added Docker build.
+
+## Version 0.2
+### Added
+- Added .NET 7 SDK as a minimum requirement to run WebGoat locally.
+- Adjusted project naming as it no longer targets .NET Core.
+
 ## Version 0.1
 ### Added
 - Added scripts to facilitate launching the WebGoat application.