From 01a8f905fd763a0700e3696121eca0a6aa0531b0 Mon Sep 17 00:00:00 2001 From: "calvin.nel@dpogroup.com" Date: Thu, 2 Apr 2026 21:34:16 +0200 Subject: [PATCH 1/2] change folder structure so the projects are in one solution --- lessons/202/cs-app-aot/cs-app-aot.sln | 24 --------------- lessons/202/cs-app/.dockerignore | 8 ----- lessons/202/cs-app/cs-app.sln | 24 --------------- lessons/202/{cs-app-aot => cs}/.dockerignore | 0 lessons/202/cs/cs-app-aot.sln | 30 +++++++++++++++++++ .../{ => cs}/cs-app-aot/AmazonS3Uploader.cs | 0 lessons/202/{ => cs}/cs-app-aot/Dockerfile | 4 +-- lessons/202/{ => cs}/cs-app-aot/Program.cs | 0 .../cs-app-aot/Properties/launchSettings.json | 0 lessons/202/{ => cs}/cs-app-aot/StaticData.cs | 0 .../cs-app-aot/appsettings.Development.json | 0 .../202/{ => cs}/cs-app-aot/appsettings.json | 0 .../202/{ => cs}/cs-app-aot/cs-app-aot.csproj | 10 +++---- .../202/{ => cs}/cs-app/AmazonS3Uploader.cs | 0 lessons/202/{ => cs}/cs-app/Dockerfile | 4 +-- lessons/202/{ => cs}/cs-app/Program.cs | 0 .../cs-app/Properties/launchSettings.json | 0 lessons/202/{ => cs}/cs-app/StaticData.cs | 0 .../cs-app/appsettings.Development.json | 0 lessons/202/{ => cs}/cs-app/appsettings.json | 0 lessons/202/{ => cs}/cs-app/cs-app.csproj | 10 +++---- 21 files changed, 44 insertions(+), 70 deletions(-) delete mode 100644 lessons/202/cs-app-aot/cs-app-aot.sln delete mode 100644 lessons/202/cs-app/.dockerignore delete mode 100644 lessons/202/cs-app/cs-app.sln rename lessons/202/{cs-app-aot => cs}/.dockerignore (100%) create mode 100644 lessons/202/cs/cs-app-aot.sln rename lessons/202/{ => cs}/cs-app-aot/AmazonS3Uploader.cs (100%) rename lessons/202/{ => cs}/cs-app-aot/Dockerfile (77%) rename lessons/202/{ => cs}/cs-app-aot/Program.cs (100%) rename lessons/202/{ => cs}/cs-app-aot/Properties/launchSettings.json (100%) rename lessons/202/{ => cs}/cs-app-aot/StaticData.cs (100%) rename lessons/202/{ => cs}/cs-app-aot/appsettings.Development.json (100%) rename lessons/202/{ => cs}/cs-app-aot/appsettings.json (100%) rename lessons/202/{ => cs}/cs-app-aot/cs-app-aot.csproj (57%) rename lessons/202/{ => cs}/cs-app/AmazonS3Uploader.cs (100%) rename lessons/202/{ => cs}/cs-app/Dockerfile (74%) rename lessons/202/{ => cs}/cs-app/Program.cs (100%) rename lessons/202/{ => cs}/cs-app/Properties/launchSettings.json (100%) rename lessons/202/{ => cs}/cs-app/StaticData.cs (100%) rename lessons/202/{ => cs}/cs-app/appsettings.Development.json (100%) rename lessons/202/{ => cs}/cs-app/appsettings.json (100%) rename lessons/202/{ => cs}/cs-app/cs-app.csproj (54%) diff --git a/lessons/202/cs-app-aot/cs-app-aot.sln b/lessons/202/cs-app-aot/cs-app-aot.sln deleted file mode 100644 index 1a8caeb44..000000000 --- a/lessons/202/cs-app-aot/cs-app-aot.sln +++ /dev/null @@ -1,24 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.2.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs-app-aot", "cs-app-aot.csproj", "{B6D6BF87-FBDF-D2DA-F801-8720BFA020C6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B6D6BF87-FBDF-D2DA-F801-8720BFA020C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6D6BF87-FBDF-D2DA-F801-8720BFA020C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6D6BF87-FBDF-D2DA-F801-8720BFA020C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6D6BF87-FBDF-D2DA-F801-8720BFA020C6}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0CBA062B-3E0D-492F-B095-77B63923E4CD} - EndGlobalSection -EndGlobal diff --git a/lessons/202/cs-app/.dockerignore b/lessons/202/cs-app/.dockerignore deleted file mode 100644 index 79326b93f..000000000 --- a/lessons/202/cs-app/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -# directories -**/bin/ -**/obj/ -**/out/ - -# files -Dockerfile* -**/*.md diff --git a/lessons/202/cs-app/cs-app.sln b/lessons/202/cs-app/cs-app.sln deleted file mode 100644 index 7ee421869..000000000 --- a/lessons/202/cs-app/cs-app.sln +++ /dev/null @@ -1,24 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.2.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs-app", "cs-app.csproj", "{05A4C554-28E9-7A2A-D927-4099EB20E1F9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {05A4C554-28E9-7A2A-D927-4099EB20E1F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05A4C554-28E9-7A2A-D927-4099EB20E1F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05A4C554-28E9-7A2A-D927-4099EB20E1F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05A4C554-28E9-7A2A-D927-4099EB20E1F9}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {731C59EE-6D6C-4530-95DA-241784F94972} - EndGlobalSection -EndGlobal diff --git a/lessons/202/cs-app-aot/.dockerignore b/lessons/202/cs/.dockerignore similarity index 100% rename from lessons/202/cs-app-aot/.dockerignore rename to lessons/202/cs/.dockerignore diff --git a/lessons/202/cs/cs-app-aot.sln b/lessons/202/cs/cs-app-aot.sln new file mode 100644 index 000000000..cdc3b28a8 --- /dev/null +++ b/lessons/202/cs/cs-app-aot.sln @@ -0,0 +1,30 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 18 +VisualStudioVersion = 18.4.11626.88 stable +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs-app", "cs-app\cs-app.csproj", "{89E391B6-F0EB-634D-B1A2-7EA2707B61E2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs-app-aot", "cs-app-aot\cs-app-aot.csproj", "{7FA194FF-E2CD-8D1D-865B-E9888DEBEF12}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89E391B6-F0EB-634D-B1A2-7EA2707B61E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89E391B6-F0EB-634D-B1A2-7EA2707B61E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89E391B6-F0EB-634D-B1A2-7EA2707B61E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89E391B6-F0EB-634D-B1A2-7EA2707B61E2}.Release|Any CPU.Build.0 = Release|Any CPU + {7FA194FF-E2CD-8D1D-865B-E9888DEBEF12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FA194FF-E2CD-8D1D-865B-E9888DEBEF12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FA194FF-E2CD-8D1D-865B-E9888DEBEF12}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7FA194FF-E2CD-8D1D-865B-E9888DEBEF12}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0CBA062B-3E0D-492F-B095-77B63923E4CD} + EndGlobalSection +EndGlobal diff --git a/lessons/202/cs-app-aot/AmazonS3Uploader.cs b/lessons/202/cs/cs-app-aot/AmazonS3Uploader.cs similarity index 100% rename from lessons/202/cs-app-aot/AmazonS3Uploader.cs rename to lessons/202/cs/cs-app-aot/AmazonS3Uploader.cs diff --git a/lessons/202/cs-app-aot/Dockerfile b/lessons/202/cs/cs-app-aot/Dockerfile similarity index 77% rename from lessons/202/cs-app-aot/Dockerfile rename to lessons/202/cs/cs-app-aot/Dockerfile index 981040518..e5dddcb83 100644 --- a/lessons/202/cs-app-aot/Dockerfile +++ b/lessons/202/cs/cs-app-aot/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build ARG TARGETARCH WORKDIR /src COPY *.csproj ./ @@ -9,7 +9,7 @@ RUN dotnet publish -c Release -a $TARGETARCH -r linux-x64 -o /app \ /p:PublishAot=true /p:StripSymbols=true /p:IlcGenerateStackTraceData=false \ /p:AssemblyName=cs-app-aot -FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-noble-chiseled +FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble-chiseled ENV ASPNETCORE_URLS=http://+:8080 \ DOTNET_EnableDiagnostics=0 WORKDIR /app diff --git a/lessons/202/cs-app-aot/Program.cs b/lessons/202/cs/cs-app-aot/Program.cs similarity index 100% rename from lessons/202/cs-app-aot/Program.cs rename to lessons/202/cs/cs-app-aot/Program.cs diff --git a/lessons/202/cs-app-aot/Properties/launchSettings.json b/lessons/202/cs/cs-app-aot/Properties/launchSettings.json similarity index 100% rename from lessons/202/cs-app-aot/Properties/launchSettings.json rename to lessons/202/cs/cs-app-aot/Properties/launchSettings.json diff --git a/lessons/202/cs-app-aot/StaticData.cs b/lessons/202/cs/cs-app-aot/StaticData.cs similarity index 100% rename from lessons/202/cs-app-aot/StaticData.cs rename to lessons/202/cs/cs-app-aot/StaticData.cs diff --git a/lessons/202/cs-app-aot/appsettings.Development.json b/lessons/202/cs/cs-app-aot/appsettings.Development.json similarity index 100% rename from lessons/202/cs-app-aot/appsettings.Development.json rename to lessons/202/cs/cs-app-aot/appsettings.Development.json diff --git a/lessons/202/cs-app-aot/appsettings.json b/lessons/202/cs/cs-app-aot/appsettings.json similarity index 100% rename from lessons/202/cs-app-aot/appsettings.json rename to lessons/202/cs/cs-app-aot/appsettings.json diff --git a/lessons/202/cs-app-aot/cs-app-aot.csproj b/lessons/202/cs/cs-app-aot/cs-app-aot.csproj similarity index 57% rename from lessons/202/cs-app-aot/cs-app-aot.csproj rename to lessons/202/cs/cs-app-aot/cs-app-aot.csproj index 1f11a6362..3345cb055 100644 --- a/lessons/202/cs-app-aot/cs-app-aot.csproj +++ b/lessons/202/cs/cs-app-aot/cs-app-aot.csproj @@ -1,7 +1,7 @@ - + - net9.0 + net10.0 enable enable cs_app_aot @@ -9,9 +9,9 @@ - - - + + + diff --git a/lessons/202/cs-app/AmazonS3Uploader.cs b/lessons/202/cs/cs-app/AmazonS3Uploader.cs similarity index 100% rename from lessons/202/cs-app/AmazonS3Uploader.cs rename to lessons/202/cs/cs-app/AmazonS3Uploader.cs diff --git a/lessons/202/cs-app/Dockerfile b/lessons/202/cs/cs-app/Dockerfile similarity index 74% rename from lessons/202/cs-app/Dockerfile rename to lessons/202/cs/cs-app/Dockerfile index ea235aa6d..0f428d3f4 100644 --- a/lessons/202/cs-app/Dockerfile +++ b/lessons/202/cs/cs-app/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build ARG TARGETARCH WORKDIR /source @@ -9,7 +9,7 @@ COPY . . RUN dotnet publish -c Release -a $TARGETARCH --no-restore -o /app /p:PublishReadyToRun=true # Runtime stage (chiseled = smaller, faster startup) -FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled +FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled ENV ASPNETCORE_URLS=http://+:8080 \ DOTNET_EnableDiagnostics=0 EXPOSE 8080 diff --git a/lessons/202/cs-app/Program.cs b/lessons/202/cs/cs-app/Program.cs similarity index 100% rename from lessons/202/cs-app/Program.cs rename to lessons/202/cs/cs-app/Program.cs diff --git a/lessons/202/cs-app/Properties/launchSettings.json b/lessons/202/cs/cs-app/Properties/launchSettings.json similarity index 100% rename from lessons/202/cs-app/Properties/launchSettings.json rename to lessons/202/cs/cs-app/Properties/launchSettings.json diff --git a/lessons/202/cs-app/StaticData.cs b/lessons/202/cs/cs-app/StaticData.cs similarity index 100% rename from lessons/202/cs-app/StaticData.cs rename to lessons/202/cs/cs-app/StaticData.cs diff --git a/lessons/202/cs-app/appsettings.Development.json b/lessons/202/cs/cs-app/appsettings.Development.json similarity index 100% rename from lessons/202/cs-app/appsettings.Development.json rename to lessons/202/cs/cs-app/appsettings.Development.json diff --git a/lessons/202/cs-app/appsettings.json b/lessons/202/cs/cs-app/appsettings.json similarity index 100% rename from lessons/202/cs-app/appsettings.json rename to lessons/202/cs/cs-app/appsettings.json diff --git a/lessons/202/cs-app/cs-app.csproj b/lessons/202/cs/cs-app/cs-app.csproj similarity index 54% rename from lessons/202/cs-app/cs-app.csproj rename to lessons/202/cs/cs-app/cs-app.csproj index f29f2da5c..0470b1c7b 100644 --- a/lessons/202/cs-app/cs-app.csproj +++ b/lessons/202/cs/cs-app/cs-app.csproj @@ -1,16 +1,16 @@ - + - net9.0 + net10.0 enable enable cs_app - - - + + + From 8301a9cdbac277b99d2cbe98b3bb22e9b42f4f4f Mon Sep 17 00:00:00 2001 From: "calvin.nel@dpogroup.com" Date: Thu, 2 Apr 2026 21:35:04 +0200 Subject: [PATCH 2/2] update solution file name --- lessons/202/cs/{cs-app-aot.sln => cs-app.sln} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lessons/202/cs/{cs-app-aot.sln => cs-app.sln} (100%) diff --git a/lessons/202/cs/cs-app-aot.sln b/lessons/202/cs/cs-app.sln similarity index 100% rename from lessons/202/cs/cs-app-aot.sln rename to lessons/202/cs/cs-app.sln