From 41b5bca9edf38ca02d5d034e9dd2afb99777a609 Mon Sep 17 00:00:00 2001
From: Adonais Romero Gonzalez <adonais.neoadonis@gmail.com>
Date: Fri, 7 Jun 2024 13:22:11 -0700
Subject: [PATCH] Fix text and minor issues in Winget configuration files

---
 configuration.dsc.yaml        | 30 ++++++++++++------------------
 configuration_vsonly.dsc.yaml |  6 +++---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/configuration.dsc.yaml b/configuration.dsc.yaml
index 3bb6b6685..f8245c080 100644
--- a/configuration.dsc.yaml
+++ b/configuration.dsc.yaml
@@ -4,18 +4,18 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio Community 2022
+        description: Install Visual Studio 2022 Community
         allowPrerelease: true
       settings:
         id: Microsoft.VisualStudio.2022.Community
         source: winget
+        useLatest: true
     - resource: Microsoft.VisualStudio.DSC/VSComponents
       id: vsComponents
       dependsOn:
         - vsPackage
       directives:
-        description: Install required VS workloads
-        allowPrerelease: true
+        description: Install required VS workloads and components
       settings:
         productId: Microsoft.VisualStudio.Product.Community
         channelId: VisualStudio.17.Release
@@ -42,28 +42,26 @@ properties:
           - Microsoft.VisualStudio.Component.VC.MFC.ARM64
           - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre
           - Microsoft.VisualStudio.Workload.NativeDesktop
-   
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: sdkPackage
-      dependsOn:
-        - vsComponents
       directives:
-        description: Install Windows SDK
+        description: Install Windows SDK version 26100
         allowPrerelease: true
       settings:
         id: Microsoft.WindowsSDK.10.0.26100
         source: winget
+        useLatest: true
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: wdkPackage
       dependsOn:
         - sdkPackage
-        - vsComponents
       directives:
-        description: Install Windows Driver Kit
+        description: Install Windows Driver Kit version 26100
         allowPrerelease: true
       settings:
         id: Microsoft.WindowsWDK.10.0.26100
         source: winget
+        useLatest: true
     - resource: PSDscResources/Script
       id: wdkVsix
       dependsOn:
@@ -73,15 +71,11 @@ properties:
         description: Install Windows Driver Kit VSIX
       settings:
         GetScript: |
-          return & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.Windows.DriverKit -property installationVersion
+          return & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -version '[17.0,18.0)' -requires Microsoft.Windows.DriverKit -property installationVersion
         SetScript: |
-          $path = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -latest -products * -property enginePath | Join-Path -ChildPath 'VSIXInstaller.exe'
-          $arch = $env:PROCESSOR_ARCHITECTURE  
-          if (Test-Path $path) { & $path /q "${env:ProgramFiles(x86)}\Windows Kits\10\Vsix\VS2022\10.0.26100.0\$arch\WDK.vsix" }
+          $installerPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -latest -products * -property enginePath | Join-Path -ChildPath 'VSIXInstaller.exe'
+          if (Test-Path $installerPath) { & $installerPath /q "${env:ProgramFiles(x86)}\Windows Kits\10\Vsix\VS2022\10.0.26100.0\${env:PROCESSOR_ARCHITECTURE}\WDK.vsix" }
         TestScript: |
-          $versionString = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.Windows.DriverKit -Property installationVersion
-          if (-not $versionString) { return $false }
-          $versionArray = $versionString.Split('.')
-          if ($versionArray[0] -le 17) { return $false }
-          return $true
+          $versionString = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -version '[17.0,18.0)' -requires Microsoft.Windows.DriverKit -property installationVersion
+          return $versionString -match "^17\."
   configurationVersion: 0.2.0
diff --git a/configuration_vsonly.dsc.yaml b/configuration_vsonly.dsc.yaml
index b7764f0f0..6ce4fc83c 100644
--- a/configuration_vsonly.dsc.yaml
+++ b/configuration_vsonly.dsc.yaml
@@ -4,18 +4,18 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
-        description: Install Visual Studio Community 2022
+        description: Install Visual Studio 2022 Community
         allowPrerelease: true
       settings:
         id: Microsoft.VisualStudio.2022.Community
         source: winget
+        useLatest: true
     - resource: Microsoft.VisualStudio.DSC/VSComponents
       id: vsComponents
       dependsOn:
         - vsPackage
       directives:
-        description: Install required VS workloads
-        allowPrerelease: true
+        description: Install required VS workloads and components
       settings:
         productId: Microsoft.VisualStudio.Product.Community
         channelId: VisualStudio.17.Release