From 84a7deae246ddab0f1741f6b758440c3753f3752 Mon Sep 17 00:00:00 2001
From: Vasilii Polikarpov
 <126792224+vpolikarpov-akvelon@users.noreply.github.com>
Date: Wed, 15 Nov 2023 11:22:43 +0100
Subject: [PATCH] [Windows] Update Visual Studio and .NET (#8805)

* Update VS to 17.8

* Update signature for VS 2019

* Add dotnet 7 to toolset
---
 images/win/toolsets/toolset-2019.json |  5 +++--
 images/win/toolsets/toolset-2022.json | 23 +++++++++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 353aed4d..fdc24fbc 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -267,7 +267,7 @@
         "subversion" : "16",
         "edition" : "Enterprise",
         "channel": "release",
-        "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE",
+        "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0",
         "workloads": [
             "Component.Dotfuscator",
             "Component.Linux.CMake",
@@ -423,7 +423,8 @@
     },
     "dotnet": {
         "versions": [
-            "6.0"
+            "6.0",
+            "7.0"
         ],
         "tools": [
             { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" }
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index a954ad94..aee512f7 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -177,7 +177,7 @@
         "subversion" : "17",
         "edition" : "Enterprise",
         "channel": "release",
-        "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE",
+        "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0",
         "workloads": [
             "Component.Dotfuscator",
             "Component.Linux.CMake",
@@ -267,6 +267,24 @@
             "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC",
             "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre",
             "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64",
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre",
             "Microsoft.VisualStudio.Component.VC.ATLMFC",
             "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre",
             "Microsoft.VisualStudio.Component.Windows10SDK.19041",
@@ -346,7 +364,8 @@
     },
     "dotnet": {
         "versions": [
-            "6.0"
+            "6.0",
+            "7.0"
         ],
         "tools": [
             { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" }