From 6b240d802cebb36ce227f8ab146d856151b33140 Mon Sep 17 00:00:00 2001
From: David Sungaila <david.sungaila@arcor.de>
Date: Fri, 11 Oct 2024 13:34:03 +0200
Subject: [PATCH] Update workflows

---
 .../windows-servercore-aot.dockerfile         | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile
index 6571beb..8790f52 100644
--- a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile
+++ b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2022 AS base
 WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-ltsc2022 AS restore
@@ -20,13 +20,21 @@ SHELL ["cmd", "/S", "/C"]
 RUN powershell -c "Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe"
 RUN (start /w vs_buildtools.exe --wait --norestart --nocache \
         --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" \
-        --add Microsoft.VisualStudio.Workload.VCTools \
+        --add Microsoft.VisualStudio.Component.Roslyn.Compiler \
+        --add Microsoft.Component.MSBuild \
+        --add Microsoft.VisualStudio.Component.CoreBuildTools \
+        --add Microsoft.VisualStudio.Workload.MSBuildTools \
+        --add Microsoft.VisualStudio.Component.Windows10SDK \
+        --add Microsoft.VisualStudio.Component.VC.CoreBuildTools \
         --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
+        --add Microsoft.VisualStudio.Component.VC.Redist.14.Latest \
         --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
-        --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 \
-        --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 \
-        --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 \
-        --remove Microsoft.VisualStudio.Component.Windows81SDK \
+        --add Microsoft.VisualStudio.Component.TextTemplating \
+        --add Microsoft.VisualStudio.Component.VC.CoreIde \
+        --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \
+        --add Microsoft.VisualStudio.Workload.VCTools \
+        --add Microsoft.Component.MSBuild \
+        --add Microsoft.VisualStudio.Workload.VCTools \
         || IF "%ERRORLEVEL%"=="3010" EXIT 0) \
     && del /q vs_buildtools.exe