From 734e40ba51939a9950e387207c23d73c7c85567d Mon Sep 17 00:00:00 2001
From: JakobL-MSFT <110699333+JakobL-MSFT@users.noreply.github.com>
Date: Mon, 15 Jan 2024 10:23:28 -0800
Subject: Merge main to develop (#1075)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Workaround to fix issues install VS using winget configuration

* Add winget configuration file to install VS only

---------

Co-authored-by: Adonais Romero González <adonais.neoadonis@gmail.com>
---
 configuration.dsc.yaml        |  1 +
 configuration_vsonly.dsc.yaml | 46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 configuration_vsonly.dsc.yaml

diff --git a/configuration.dsc.yaml b/configuration.dsc.yaml
index 62abdf99..d259db24 100644
--- a/configuration.dsc.yaml
+++ b/configuration.dsc.yaml
@@ -15,6 +15,7 @@ properties:
         - vsPackage
       directives:
         description: Install required VS workloads
+        maxVersion: "1.0.15"
         allowPrerelease: true
       settings:
         productId: Microsoft.VisualStudio.Product.Community
diff --git a/configuration_vsonly.dsc.yaml b/configuration_vsonly.dsc.yaml
new file mode 100644
index 00000000..a46f410e
--- /dev/null
+++ b/configuration_vsonly.dsc.yaml
@@ -0,0 +1,46 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: vsPackage
+      directives:
+        description: Install Visual Studio Community 2022
+        allowPrerelease: true
+      settings:
+        id: Microsoft.VisualStudio.2022.Community
+        source: winget
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      id: vsComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads
+        maxVersion: "1.0.15"
+        allowPrerelease: true
+      settings:
+        productId: Microsoft.VisualStudio.Product.Community
+        channelId: VisualStudio.17.Release
+        includeRecommended: false
+        components:
+          - Microsoft.VisualStudio.Component.VC.CoreBuildTools
+          - Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core
+          - Microsoft.VisualStudio.Component.VC.Tools.x86.x64
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64
+          - Microsoft.VisualStudio.Component.VC.Tools.ARM64EC
+          - Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre
+          - Microsoft.VisualStudio.Component.VC.Redist.14.Latest
+          - Microsoft.VisualStudio.Component.Windows10SDK
+          - Microsoft.VisualStudio.Component.VC.ATL
+          - Microsoft.VisualStudio.Component.VC.ATL.ARM64
+          - Microsoft.VisualStudio.Component.VC.ATL.Spectre
+          - Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre
+          - Microsoft.VisualStudio.Component.VC.ATLMFC
+          - Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre
+          - Microsoft.VisualStudio.Component.VC.ASAN
+          - Microsoft.VisualStudio.Component.NuGet.BuildTools
+          - Microsoft.VisualStudio.Component.VC.MFC.ARM64
+          - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
+          - Microsoft.VisualStudio.Workload.NativeDesktop
+  configurationVersion: 0.2.0
-- 
cgit v1.3.1