From efcefca087530a54af9874b0e3552e4522c5bbe1 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Tue, 28 Sep 2021 16:03:39 +0300
Subject: [PATCH] Revert "[Windows OS] Include Microsoft Game Development Kit
 (GDK) to image" (#4162)

---
 images/win/scripts/Installers/Install-GDK.ps1 | 19 -------------------
 .../SoftwareReport/SoftwareReport.Common.psm1 |  7 -------
 .../SoftwareReport.Generator.ps1              |  5 -----
 images/win/scripts/Tests/Tools.Tests.ps1      |  6 ------
 images/win/windows2019.json                   |  1 -
 5 files changed, 38 deletions(-)
 delete mode 100644 images/win/scripts/Installers/Install-GDK.ps1

diff --git a/images/win/scripts/Installers/Install-GDK.ps1 b/images/win/scripts/Installers/Install-GDK.ps1
deleted file mode 100644
index 6283167d5..000000000
--- a/images/win/scripts/Installers/Install-GDK.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-##  File:  Install-GDK.ps1
-##  Desc:  Install Microsoft Game Developement Kit
-################################################################################
-
-# Preparation
-$tempFolder = Join-Path $env:Tmp "GDK"
-
-# Fetching Microsoft GDK release version
-$GDKReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/GDK/releases/latest").tag_name
-
-# Cloning GDK repo and checking out to release
-git clone --depth 1 --branch $GDKReleaseVersion "https://github.com/microsoft/GDK.git" $tempFolder
-
-# Installing GDK
-$GDKInstaller = Join-Path $tempFolder "pgdk.exe"
-Install-Binary -FilePath $GDKInstaller -ArgumentList ("/quiet", "/norestart")
-
-Invoke-PesterTests -Testfile "Tools" -TestName "Microsoft GDK"
\ No newline at end of file
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
index 71adb7a96..2f6ca4c52 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -329,13 +329,6 @@ function Get-PipxVersion {
     return "Pipx $pipxVersion"
 }
 
-function Get-GDKVersion {
-    $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
-    $installedApplications = Get-ItemProperty -Path $regKey
-    $GDKRelease = $installedApplications | Where-Object DisplayName -match "Microsoft Game Development Kit"
-    return "$($GDKRelease.DisplayName) $($GDKRelease.DisplayVersion)"
-}
-
 function Build-PackageManagementEnvironmentTable {
     $envVariables = @(
         @{
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 6a59ed3ae..608adaa23 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -124,11 +124,6 @@ $toolsList = @(
     (Get-ZstdVersion),
     (Get-YAMLLintVersion)
 )
-if (Test-IsWin19) {
-    $toolsList += @(
-        (Get-GDKVersion)
-    )
-}
 if ((Test-IsWin16) -or (Test-IsWin19)) {
     $toolsList += @(
         (Get-NSISVersion),
diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1
index e333e7d63..c45660e00 100644
--- a/images/win/scripts/Tests/Tools.Tests.ps1
+++ b/images/win/scripts/Tests/Tools.Tests.ps1
@@ -100,12 +100,6 @@ Describe "Mingw64" {
     }
 }
 
-Describe "Microsoft GDK" -Skip:(-not (Test-IsWin19)) {
-    It "GDK" {
-        "$($env:GRDKLatest)grdk.ini" | Should -Exist
-    }
-}
-
 Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) {
     It "<ToolName>" -TestCases @(
         @{ ToolName = "bq" }
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index 1bc66248a..af3c1ea91 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -252,7 +252,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-GDK.ps1",
                 "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1",