From 6255c1ed960f5277d2e96ac2d0968c2c7e844ce2 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Fri, 31 Jan 2020 23:29:56 -0800
Subject: [PATCH] Revert Arcade version and workaround (#18724)

---
 build.ps1                         |  4 ----
 eng/Empty.Directory.Build.props   |  2 --
 eng/Empty.Directory.Build.targets |  2 --
 eng/Version.Details.xml           | 12 ++++++------
 eng/Versions.props                |  2 +-
 eng/common/tools.ps1              |  5 +----
 global.json                       |  4 ++--
 7 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 eng/Empty.Directory.Build.props
 delete mode 100644 eng/Empty.Directory.Build.targets

diff --git a/build.ps1 b/build.ps1
index b9e6550981..042916322b 100644
--- a/build.ps1
+++ b/build.ps1
@@ -342,10 +342,6 @@ if ($tmpBinaryLog) {
     $MSBuildArguments += "/bl:$LogDir/Build.binlog"
 }
 
-# Prevent the root Directory.Build.props and Directory.Build.targets from being imported by files in the TempDir
-Copy-Item (Join-Path $EngRoot 'Empty.Directory.Build.props') (Join-Path $TempDir 'Directory.Build.props') -ea Ignore
-Copy-Item (Join-Path $EngRoot 'Empty.Directory.Build.targets') (Join-Path $TempDir 'Directory.Build.targets') -ea Ignore
-
 # Capture MSBuild crash logs
 $env:MSBUILDDEBUGPATH = $LogDir
 
diff --git a/eng/Empty.Directory.Build.props b/eng/Empty.Directory.Build.props
deleted file mode 100644
index c1df2220dd..0000000000
--- a/eng/Empty.Directory.Build.props
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
\ No newline at end of file
diff --git a/eng/Empty.Directory.Build.targets b/eng/Empty.Directory.Build.targets
deleted file mode 100644
index c1df2220dd..0000000000
--- a/eng/Empty.Directory.Build.targets
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d890b4605f..7b3d0f81ab 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -412,17 +412,17 @@
       <Uri>https://github.com/dotnet/extensions</Uri>
       <Sha>275e691f7e575f208290d1cbb8cb450f4a3a85d6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20076.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20074.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha>
+      <Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20076.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20074.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha>
+      <Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20076.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20074.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha>
+      <Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha.1.20079.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
       <Uri>https://github.com/dotnet/extensions</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index aebd8c9975..95fa3369a2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -60,7 +60,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20076.3</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20074.6</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index b059a19277..d3a432878e 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -655,9 +655,6 @@ Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir
 Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir
 Write-PipelineSetVariable -Name 'TMP' -Value $TempDir
 
-$env:TEMP=$TempDir
-$env:TMP=$TempDir
-
 # Import custom tools configuration, if present in the repo.
 # Note: Import in global scope so that the script set top-level variables without qualification.
 if (!$disableConfigureToolsetImport) {
@@ -671,4 +668,4 @@ if (!$disableConfigureToolsetImport) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/global.json b/global.json
index 8d1cda730a..2606b9bc6e 100644
--- a/global.json
+++ b/global.json
@@ -25,7 +25,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20076.3",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20076.3"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20074.6",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20074.6"
   }
 }