diff options
| author | Jacob Ronstadt <[email protected]> | 2024-05-22 08:29:15 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-22 08:29:15 -0700 |
| commit | 38730054734e5a36e330d317d844084d0def539e (patch) | |
| tree | 7abddf38f11370ed3be88c24d130b89820237aab | |
| parent | a74a241c664c4e1d7c0838287b34076c19d9858a (diff) | |
| parent | b96e35c91b02c3d68f29e71b4fe312cb6badc660 (diff) | |
Merge pull request #1169 from jacob-ronstadt/jacob-ronstadt/config
Update configuration.dsc.yml for 26100
| -rw-r--r-- | configuration.dsc.yaml | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/configuration.dsc.yaml b/configuration.dsc.yaml index 68af36fa..3bb6b668 100644 --- a/configuration.dsc.yaml +++ b/configuration.dsc.yaml @@ -4,19 +4,18 @@ properties: - resource: Microsoft.WinGet.DSC/WinGetPackage id: vsPackage directives: - description: Install Visual Studio 2022 Community + description: Install Visual Studio Community 2022 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 - maxVersion: "1.0.21" + allowPrerelease: true settings: productId: Microsoft.VisualStudio.Product.Community channelId: VisualStudio.17.Release @@ -43,18 +42,28 @@ properties: - Microsoft.VisualStudio.Component.VC.MFC.ARM64 - Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre - Microsoft.VisualStudio.Workload.NativeDesktop - - Microsoft.VisualStudio.Component.Windows11SDK.22621 + + - resource: Microsoft.WinGet.DSC/WinGetPackage + id: sdkPackage + dependsOn: + - vsComponents + directives: + description: Install Windows SDK + allowPrerelease: true + settings: + id: Microsoft.WindowsSDK.10.0.26100 + source: winget - resource: Microsoft.WinGet.DSC/WinGetPackage id: wdkPackage dependsOn: + - sdkPackage - vsComponents directives: description: Install Windows Driver Kit allowPrerelease: true settings: - id: Microsoft.WindowsWDK.10.0.22621 + id: Microsoft.WindowsWDK.10.0.26100 source: winget - useLatest: true - resource: PSDscResources/Script id: wdkVsix dependsOn: @@ -67,7 +76,8 @@ properties: return & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -nologo -latest -products Microsoft.VisualStudio.Product.Community -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' - if (Test-Path $path) { & $path /q "${env:ProgramFiles(x86)}\Windows Kits\10\Vsix\VS2022\10.0.22621.0\WDK.vsix" } + $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" } 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 } |