From 625a3cb7eb14901571fde9fdf2ffd13491c80efe Mon Sep 17 00:00:00 2001
From: Shamil Mubarakshin
 <127750046+shamil-mubarakshin@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:54:30 +0100
Subject: [PATCH] [windows] Update Visual Studio Software Report (#11171)

---
 .../docs-gen/SoftwareReport.VisualStudio.psm1      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1
index 69bad2f022d6..082a840b11fa 100644
--- a/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1
+++ b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1
@@ -43,18 +43,24 @@ function Get-VisualStudioExtensions {
     )
 
     # WDK
-    $wdkVersion = Get-WDKVersion
+    if (-not (Test-IsWin25)) {
+        $wdkVersion = Get-WDKVersion
+        $wdkPackages = @(
+            @{Package = 'Windows Driver Kit'; Version = $wdkVersion }
+        )
+    }
+
+    # WDK extension
     $wdkExtensionVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit'
-    $wdkPackages = @(
-        @{Package = 'Windows Driver Kit'; Version = $wdkVersion }
+    $wdkExtensions = @(
         @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion }
     )
 
     $extensions = @(
         $vsixs
-        $ssdtPackages
         $sdkPackages
         $wdkPackages
+        $wdkExtensions
     )
 
     $extensions | Foreach-Object {