From 0f985b1947ef457d2593e9a37d2ae8570b600bc1 Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Mon, 14 Dec 2020 22:10:08 -0800
Subject: [PATCH] Restore the changes to the files in the eng/ foler and
 global.json

---
 eng/Version.Details.xml                    | 18 +++++++++---------
 eng/Versions.props                         |  2 +-
 eng/common/post-build/post-build-utils.ps1 |  6 +++---
 global.json                                |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2b1c35b5e..aa20beb8a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -129,12 +129,12 @@
       <Uri>https://github.com/dotnet/msbuild</Uri>
       <Sha>56ab6340935d039999a588621733fa2384dae2a3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.9.0-preview.2.6979" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.9.0-preview.2.6967" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
-      <Sha>8e3cdf1b3475a0cb68a65dd2ffd51a2135f1fb67</Sha>
+      <Sha>a4c9d63bf942f1df1ba9486a87bad2e4b6888488</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
+      <Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
       <Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
     </Dependency>
     <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@@ -148,13 +148,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20610.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20608.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3346d7b4ff047c854913fb2ded6e3aa726da6d11</Sha>
+      <Sha>b984ce874f048ec28e1067e9f47bdb183682df46</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20610.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20608.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3346d7b4ff047c854913fb2ded6e3aa726da6d11</Sha>
+      <Sha>b984ce874f048ec28e1067e9f47bdb183682df46</Sha>
     </Dependency>
     <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@@ -164,9 +164,9 @@
       <Uri>https://github.com/dotnet/sourcelink</Uri>
       <Sha>f3182c5db7acd80fab1e8ce3332b327886692951</Sha>
     </Dependency>
-    <Dependency Name="XliffTasks" Version="1.0.0-beta.20609.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="XliffTasks" Version="1.0.0-beta.20605.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>a23212cca46ae31bda5641976c457c29ae76f137</Sha>
+      <Sha>e3a45fddee008a25d4dfc1c5222d93636ecf009b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index f080db939..8f61a3a42 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.20610.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.20608.21</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1
index 534f6988d..7d4974479 100644
--- a/eng/common/post-build/post-build-utils.ps1
+++ b/eng/common/post-build/post-build-utils.ps1
@@ -69,9 +69,9 @@ function Trigger-Subscription([string]$SubscriptionId) {
 
 function Validate-MaestroVars {
   try {
-    Get-Variable MaestroApiEndPoint | Out-Null
-    Get-Variable MaestroApiVersion | Out-Null
-    Get-Variable MaestroApiAccessToken | Out-Null
+    Get-Variable MaestroApiEndPoint -Scope Global | Out-Null
+    Get-Variable MaestroApiVersion -Scope Global | Out-Null
+    Get-Variable MaestroApiAccessToken -Scope Global | Out-Null
 
     if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) {
       Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'"
diff --git a/global.json b/global.json
index 3b8f38f68..2c17d237a 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20610.4"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20608.21"
   }
 }