Revert "Update NuGet global packages cache detection" (#14874)

Author: premun

eng/common/tools.ps1

@@ -650,20 +650,7 @@ function GetNuGetPackageCachePath() {
     # use global cache in dev builds to avoid cost of downloading packages.
     # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968
     if ($useGlobalNuGetCache) {
-      # Check NuGet.Config to see if the packages folder has been redirected https://github.com/dotnet/arcade/issues/14761
-      $nugetConfig = Join-Path $env:APPDATA "NuGet\NuGet.Config"
-      if (Test-Path -Path $nugetConfig) {
-        [xml]$nugetConfigXml = Get-Content $nugetConfig
-
-        # Set the NUGET_PACKAGES environment variable to match the configured globalPackagesFolder. If there is no
-        # global packages folder, this expression will evaluate to the empty string which will effectively leave the
-        # environment variable set to null.
-        $env:NUGET_PACKAGES = $nugetConfigXml.SelectSingleNode("//configuration/config/add[@key='globalPackagesFolder']").value
-      }
-
-      if ($env:NUGET_PACKAGES -eq $null) {
-        $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
-      }
+      $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
     } else {
       $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
       $env:RESTORENOHTTPCACHE = $true

src/Microsoft.DotNet.Arcade.Sdk/tools/RepoLayout.props

@@ -5,6 +5,14 @@
      Properties describing the layout of the repo.
   -->
 
+  <PropertyGroup>
+    <!-- Respect environment variable for the NuGet Packages Root if set; otherwise, use the current default location -->
+    <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' != ''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)'))</NuGetPackageRoot>
+    <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and '$(NUGET_PACKAGES)' != ''">$([MSBuild]::NormalizeDirectory('$(NUGET_PACKAGES)'))</NuGetPackageRoot>
+    <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and '$(OS)' == 'Windows_NT'">$([MSBuild]::NormalizeDirectory('$(UserProfile)', '.nuget', 'packages'))</NuGetPackageRoot>
+    <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' and '$(OS)' != 'Windows_NT'">$([MSBuild]::NormalizeDirectory('$(HOME)', '.nuget', 'packages'))</NuGetPackageRoot>
+  </PropertyGroup>
+
   <PropertyGroup>
     <RepoRoot Condition="'$(RepoRoot)' == ''">$([MSBuild]::NormalizeDirectory('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'global.json'))'))</RepoRoot>
   </PropertyGroup>

src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets

@@ -19,10 +19,6 @@
          Writes a stub file to component intermediate directory.
   -->
 
-  <PropertyGroup>
-    <ArcadeVisualStudioBuildTasksAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.visualstudio\$(MicrosoftDotNetBuildTasksVisualStudioVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</ArcadeVisualStudioBuildTasksAssembly>
-  </PropertyGroup>
-
   <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.FinalizeInsertionVsixFile" AssemblyFile="$(ArcadeVisualStudioBuildTasksAssembly)" />
 
   <PropertyGroup>

src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props

@@ -1,6 +1,10 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
+  <PropertyGroup>
+    <ArcadeVisualStudioBuildTasksAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.visualstudio\$(MicrosoftDotNetBuildTasksVisualStudioVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</ArcadeVisualStudioBuildTasksAssembly>
+  </PropertyGroup>
+
   <!-- Default settings for VSIX projects -->
 
   <PropertyGroup>