Revert "Add WDK on Windows Server 2022 (#5652)" (#5711)

This reverts commit 16f6912f37.

images/win/scripts/Installers/Install-WDK.ps1

@@ -4,14 +4,7 @@
 ################################################################################
 
 # Requires Windows SDK with the same version number as the WDK
-if (Test-IsWin22)
+if (Test-IsWin19)
-{
-    $winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241"
-    $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230"
-    $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix"
-    $VSver = "2022"
-}
-elseif (Test-IsWin19)
 {
     $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743"
     $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289"
@@ -27,7 +20,7 @@ elseif (Test-IsWin16)
 }
 else
 {
-    throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required"
+    throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required"
 }
 
 $argumentList = ("/features", "+", "/quiet")
@@ -39,7 +32,6 @@ Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentLi
 Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList
 
 # Need to install the VSIX to get the build targets when running VSBuild
-$FilePath = Resolve-Path -Path $FilePath
 Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly
 
 Invoke-PesterTests -TestFile "WDK"

images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1

@@ -53,13 +53,14 @@ function Get-VisualStudioExtensions {
     }
 
     # SDK
-    if ((Test-IsWin19) -or (Test-IsWin22)) {
+    if (Test-IsWin19) {
         $sdkPackageVersion = Get-SDKVersion
         $sdkPackages = @(
             @{Package = 'Windows Software Development Kit Extension'; Version = $sdkPackageVersion}
         )
     }
 
+    if ((Test-IsWin16) -or (Test-IsWin19)) {
         # Wix
         $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version
         $wixPackages = @(
@@ -73,6 +74,8 @@ function Get-VisualStudioExtensions {
             @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion}
             @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion}
         )
+    }
+    
 
     $extensions = @(
         $vsixs

images/win/scripts/Tests/WDK.Tests.ps1

@@ -1,8 +1,6 @@
-Describe "WDK" {
+Describe "WDK" -Skip:(Test-IsWin22) {
     It "WDK exists" {
-      $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
+      $WDKVersion = (Get-CimInstance -ClassName Win32_Product -Filter "Name = 'Windows Driver Kit'").Version
-      $installedApplications = Get-ItemProperty -Path $regKey
-      $WDKVersion = $installedApplications | Where-Object DisplayName -eq 'Windows Driver Kit' | Select-Object -First 1 -ExpandProperty DisplayVersion
       $WDKVersion| Should -Not -BeNullOrEmpty
     }
 

images/win/toolsets/toolset-2022.json

@@ -196,7 +196,6 @@
             "Microsoft.VisualStudio.Component.TestTools.CodedUITest",
             "Microsoft.VisualStudio.Component.TestTools.WebLoadTest",
             "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
-            "Microsoft.VisualStudio.Component.UWP.VC.ARM64EC",
             "Microsoft.VisualStudio.Component.VC.CLI.Support",
             "Microsoft.VisualStudio.Component.VC.CMake.Project",
             "Microsoft.VisualStudio.Component.VC.DiagnosticTools",
@@ -212,13 +211,9 @@
             "Microsoft.VisualStudio.Component.VC.MFC.ARM",
             "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre",
             "Microsoft.VisualStudio.Component.VC.ATL.ARM64",
-            "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre",
-            "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC",
-            "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre",
             "Microsoft.VisualStudio.Component.VC.MFC.ARM64",
             "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre",
             "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC",
-            "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre",
             "Microsoft.VisualStudio.Component.VC.Modules.x86.x64",
             "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
             "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC",

images/win/windows2022.json

@@ -174,7 +174,6 @@
             "type": "powershell",
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",