From 042428540cb43334ed615d30275482f58bfe6d2b Mon Sep 17 00:00:00 2001
From: Jeff Genovy <jefgen@microsoft.com>
Date: Thu, 16 Jun 2022 18:10:21 -0700
Subject: [PATCH 1/3] Fix the .NET SDK install script.

---
 dev/MRTCore/build/DownloadDotNetCoreSdk.ps1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/MRTCore/build/DownloadDotNetCoreSdk.ps1 b/dev/MRTCore/build/DownloadDotNetCoreSdk.ps1
index f1c6d3e72b..2ea36520b1 100644
--- a/dev/MRTCore/build/DownloadDotNetCoreSdk.ps1
+++ b/dev/MRTCore/build/DownloadDotNetCoreSdk.ps1
@@ -7,7 +7,7 @@ param(
 $dotnetInstallScript = "$env:TEMP\dotnet-install.ps1"
 
 $repoInstallDir  = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\.dotnet")
-$versionPropsFilePropertyGroup = ([xml](Get-Content -Raw "$PSScriptRoot\..\..\..\eng\versions.props")).Project.PropertyGroup[0]
+$versionPropsFilePropertyGroup = ([xml](Get-Content -Raw "$PSScriptRoot\..\..\..\eng\versions.props")).Project.PropertyGroup
 $dotNetSdkVersion = $versionPropsFilePropertyGroup.CsWinRTDependencyDotNetCoreSdkPackageVersion
 $dotNetSdkVersionLkg =  if (-not $skipLKG) { $versionPropsFilePropertyGroup.CsWinRTDependencyDotNetCoreSdkLkgPackageVersion }
 
@@ -108,7 +108,7 @@ $latestAlreadyInstalled = Is-Installed $dotNetSdkVersion
 $lkgAlreadyInstalled = $true
 
 # Only try to install the lkg sdk if specified
-if (-not [string]::IsNullOrEmpty($dotNetSdkVersionLkg))
+if ((-not [string]::IsNullOrEmpty($dotNetSdkVersionLkg)) -and ($dotNetSdkVersionLkg -ine '$(CsWinRTDependencyDotNetCoreSdkPackageVersion)'))
 {
     $lkgAlreadyInstalled = Is-Installed $dotNetSdkVersionLkg
 }
@@ -161,4 +161,3 @@ if (-not $lkgAlreadyInstalled)
 {
     Install-SDK -version $dotNetSdkVersionLkg -channel "master"
 }
-

From 11bae21865b54ac12423e2f4c3f06a5ffb29273d Mon Sep 17 00:00:00 2001
From: Jeff Genovy <jefgen@microsoft.com>
Date: Fri, 17 Jun 2022 10:14:01 -0700
Subject: [PATCH 2/3] Remove .NET SDK version from global.json file.

---
 dev/MRTCore/global.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev/MRTCore/global.json b/dev/MRTCore/global.json
index 5fd77686b0..7a37828b57 100644
--- a/dev/MRTCore/global.json
+++ b/dev/MRTCore/global.json
@@ -1,8 +1,4 @@
 {
-    "sdk": {
-        "version": "5.0.404",
-        "rollForward": "latestMajor"
-    },
     "msbuild-sdks": {
         "Microsoft.Build.NoTargets" : "1.0.88"
     }

From ee45258aa5dcb2ef61dffb82cee62e1cc6d46234 Mon Sep 17 00:00:00 2001
From: Jeff Genovy <jefgen@microsoft.com>
Date: Fri, 17 Jun 2022 11:32:00 -0700
Subject: [PATCH 3/3] Don't run the DownloadDotNetCoreSdk.ps1 script in the
 pipeline.

---
 build/build-mrt.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/build-mrt.yml b/build/build-mrt.yml
index 9451402b91..2fa252f391 100644
--- a/build/build-mrt.yml
+++ b/build/build-mrt.yml
@@ -78,19 +78,19 @@ steps:
 #      PathtoPublish: '${{ parameters.MRTSourcesDirectory }}\msbuild-install-logs'
 #      artifactName: 'installlogs'
 
-- task: powershell@2
-  displayName: 'Installing .NET SDK'
-  inputs:
-    targetType: filePath
-    workingDirectory: ${{ parameters.MRTSourcesDirectory }}\build
-    filePath: ${{ parameters.MRTSourcesDirectory }}\build\DownloadDotNetCoreSdk.ps1
-
-- task: BatchScript@1
-  displayName: 'Use .NET SDK'
-  inputs:
-    filename: '${{ parameters.MRTSourcesDirectory }}\build\SetDotnetVars.cmd'
-    arguments: '${{ parameters.MRTSourcesDirectory }}'
-    modifyEnvironment: true
+# - task: powershell@2
+#   displayName: 'Installing .NET SDK'
+#   inputs:
+#     targetType: filePath
+#     workingDirectory: ${{ parameters.MRTSourcesDirectory }}\build
+#     filePath: ${{ parameters.MRTSourcesDirectory }}\build\DownloadDotNetCoreSdk.ps1
+
+# - task: BatchScript@1
+#   displayName: 'Use .NET SDK'
+#   inputs:
+#     filename: '${{ parameters.MRTSourcesDirectory }}\build\SetDotnetVars.cmd'
+#     arguments: '${{ parameters.MRTSourcesDirectory }}'
+#     modifyEnvironment: true
 
 - task: powershell@2
   displayName: 'Create test pfx to sign MSIX test packages (DevCheck)'