From dd5158cf465295d33ade0082852cd0a8b3dc941c Mon Sep 17 00:00:00 2001
From: JoYo <>
Date: Mon, 27 Mar 2023 13:16:49 -0400
Subject: [PATCH] updated to current vs17 and ucrt

---
 Dockerfile                  | 6 +++---
 vs16.config => vs17.config  | 2 +-
 win_build_tools_install.ps1 | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename vs16.config => vs17.config (90%)

diff --git a/Dockerfile b/Dockerfile
index 247456b..40dd40b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 # escape=`
 FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
-ADD https://aka.ms/vs/16/release/channel C:\docker\visualstudio.release.chman
-ADD https://aka.ms/vs/16/release/vs_buildtools.exe C:\docker\vs_buildtools.exe
-COPY vs16.config C:\docker\.vsconfig
+ADD https://aka.ms/vs/17/release/channel C:\docker\visualstudio.release.chman
+ADD https://aka.ms/vs/17/release/vs_buildtools.exe C:\docker\vs_buildtools.exe
+COPY vs17.config C:\docker\.vsconfig
 
 RUN C:\docker\vs_buildtools.exe --quiet --wait --norestart --nocache `
     --channelUri C:\docker\visualstudio.release.chman `
diff --git a/vs16.config b/vs17.config
similarity index 90%
rename from vs16.config
rename to vs17.config
index 6869520..c030559 100644
--- a/vs16.config
+++ b/vs17.config
@@ -11,6 +11,6 @@
     "Microsoft.VisualStudio.Component.VC.Llvm.Clang",
     "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+    "Microsoft.VisualStudio.Component.Windows10SDK",
   ]
 }
diff --git a/win_build_tools_install.ps1 b/win_build_tools_install.ps1
index bdc2a8c..6a41975 100644
--- a/win_build_tools_install.ps1
+++ b/win_build_tools_install.ps1
@@ -3,14 +3,14 @@ param([parameter()][string] $msvc="C:\msvc")
 new-item -path $msvc -type directory -force
 new-item -path "temp" -type directory -force
 
-invoke-webrequest https://aka.ms/vs/16/release/channel -outfile temp\visualstudio.release.chman
-invoke-webrequest https://aka.ms/vs/16/release/vs_buildtools.exe -outfile temp\vs_buildtools.exe
+invoke-webrequest https://aka.ms/vs/17/release/channel -outfile temp\visualstudio.release.chman
+invoke-webrequest https://aka.ms/vs/17/release/vs_buildtools.exe -outfile temp\vs_buildtools.exe
 
 $arguments = @(
     "--quiet", "--wait", "--norestart", "--nocache",
     "--channeluri", ($pwd.path + "\temp\visualstudio.release.chman"),
     "--installchanneluri", ($pwd.path + "\temp\visualstudio.release.chman"),
-    "--config", ($pwd.path + "\vs16.config"),
+    "--config", ($pwd.path + "\vs17.config"),
     "--installpath", "$msvc"
 )