Properly set the nuget cache for the repo (#24505)

* Properly set the nuget cache for the repo

* Change coreclr NuGet package cache from "./packages" to "./.packages"

16 files changed, 32 insertions, 24 deletions

diff --git a/NuGet.config b/NuGet.config
index 33e9d870a5..2ab3c10107 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <config>
+    <add key="globalPackagesFolder" value="./.packages" />
+    <add key="repositoryPath" value="./.packages" />
+  </config>
   <packageRestore>
     <add key="enabled" value="True" />
   </packageRestore>
diff --git a/build-test.cmd b/build-test.cmd
index 424232ebf2..85af0d2e0a 100644
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -33,7 +33,7 @@ if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
 set "__TestDir=%__ProjectDir%\tests"
 set "__ProjectFilesDir=%__TestDir%"
 set "__SourceDir=%__ProjectDir%\src"
-set "__PackagesDir=%__ProjectDir%\packages"
+set "__PackagesDir=%__ProjectDir%\.packages"
 set "__RootBinDir=%__ProjectDir%\bin"
 set "__LogsDir=%__RootBinDir%\Logs"
 set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs"
diff --git a/build-test.sh b/build-test.sh
index 93a19800d3..b53a99f70a 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -665,7 +665,7 @@ __IncludeTests=INCLUDE_TESTS
 # Set the various build properties here so that CMake and MSBuild can pick them up
 export __ProjectDir="$__ProjectRoot"
 __SourceDir="$__ProjectDir/src"
-__PackagesDir="$__ProjectDir/packages"
+__PackagesDir="$__ProjectDir/.packages"
 __RootBinDir="$__ProjectDir/bin"
 __BuildToolsDir="$__ProjectDir/Tools"
 __DotNetCli="$__ProjectDir/dotnet.sh"
diff --git a/build.cmd b/build.cmd
index 5c517eeb0a..be43dea775 100644
--- a/build.cmd
+++ b/build.cmd
@@ -34,7 +34,7 @@ set ghprbCommentBody=
 ::      __BuildOS           -- default: Windows_NT
 ::      __ProjectDir        -- default: directory of the dir.props file
 ::      __SourceDir         -- default: %__ProjectDir%\src\
-::      __PackagesDir       -- default: %__ProjectDir%\packages\
+::      __PackagesDir       -- default: %__ProjectDir%\.packages\
 ::      __RootBinDir        -- default: %__ProjectDir%\bin\
 ::      __BinDir            -- default: %__RootBinDir%\%__BuildOS%.%__BuildArch.%__BuildType%\
 ::      __IntermediatesDir
@@ -55,7 +55,7 @@ if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
 set "__ProjectFilesDir=%__ProjectDir%"
 set "__SourceDir=%__ProjectDir%\src"
 set "__PackagesDir=%DotNetRestorePackagesPath%"
-if [%__PackagesDir%]==[] set "__PackagesDir=%__ProjectDir%\packages"
+if [%__PackagesDir%]==[] set "__PackagesDir=%__ProjectDir%\.packages"
 set "__RootBinDir=%__ProjectDir%\bin"
 set "__LogsDir=%__RootBinDir%\Logs"
 set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs"
diff --git a/build.sh b/build.sh
index a07f06af68..bf2ed184ed 100755
--- a/build.sh
+++ b/build.sh
@@ -638,7 +638,7 @@ __IgnoreWarnings=0
 # Set the various build properties here so that CMake and MSBuild can pick them up
 __ProjectDir="$__ProjectRoot"
 __SourceDir="$__ProjectDir/src"
-__PackagesDir="${DotNetRestorePackagesPath:-${__ProjectDir}/packages}"
+__PackagesDir="${DotNetRestorePackagesPath:-${__ProjectDir}/.packages}"
 __RootBinDir="$__ProjectDir/bin"
 __UnprocessedBuildArgs=
 __CommonMSBuildArgs=
diff --git a/dir.common.props b/dir.common.props
index acd84e7bae..190cf6c6de 100644
--- a/dir.common.props
+++ b/dir.common.props
@@ -6,7 +6,17 @@
 
   <PropertyGroup>
     <CoreclrDir>$(MSBuildThisFileDirectory)</CoreclrDir>
-    <PackagesDir>$(CoreclrDir)/packages</PackagesDir>
+    <PackagesDir>$(CoreclrDir)/.packages</PackagesDir>
+
+    <!-- [ARCADE_REMOVE] This property can be removed after build-tools is removed. -->
+    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
+  </PropertyGroup>
+
+  <!-- Define NuGet properties for scenarios where they aren't set. From the command line.
+       Should match Nuget.config at root. -->
+  <PropertyGroup>
+    <NuGetPackageRoot>$(PackagesDir)</NuGetPackageRoot>
+    <RestorePackagesPath>$(PackagesDir)</RestorePackagesPath>
   </PropertyGroup>
 
   <!-- Set default Configuration and Platform -->
@@ -33,9 +43,4 @@
 
     <PlatformConfigPathPart>$(BuildOS).$(BuildArch).$(BuildType)</PlatformConfigPathPart>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <RestorePackagesPath>$(PackagesDir)</RestorePackagesPath>
-  </PropertyGroup>
-
 </Project>
diff --git a/dir.props b/dir.props
index 2792ac731b..4da47073fc 100644
--- a/dir.props
+++ b/dir.props
@@ -17,10 +17,9 @@
     <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment>
   </PropertyGroup>
 
-  <!-- Set the kind of PDB to Portable and turn on SourceLink (fetching source from GitHub) -->
+  <!-- Set the kind of PDB to Portable -->
   <PropertyGroup>
-    <DebugType Condition="'$(DebugType)' == ''">Portable</DebugType> 
-    <UseSourceLink>true</UseSourceLink>
+    <DebugType Condition="'$(DebugType)' == ''">Portable</DebugType>
   </PropertyGroup>
 
   <!-- Version numbers for both managed & native binaries -->
@@ -55,7 +54,7 @@
 
     <PackagesDir>$(DotNetRestorePackagesPath)</PackagesDir>
     <PackagesDir Condition="'$(PackagesDir)'=='' and '$(__PackagesDir)'!=''">$(__PackagesDir)\</PackagesDir>
-    <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages\</PackagesDir>
+    <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)\.packages\</PackagesDir>
 
     <RootBinDir>$(__RootBinDir)\</RootBinDir>
     <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7e32bc0b87..e35c3228f8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,8 +11,7 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>bda52d7619f9420de46f2c39ffc972864bbcab63</Sha>
     </Dependency>
-    <!-- This dependency should be added, but it causes the github PR legs to not launch. -->
-    <!-- Dependency Name="microsoft.dotnet.build.tasks.feed" Version="2.2.0-beta.19229.8">
+    <Dependency Name="microsoft.dotnet.build.tasks.feed" Version="2.2.0-beta.19229.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
     </Dependency-->
diff --git a/eng/Versions.props b/eng/Versions.props
index 373257e882..17dc5469c4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,6 +13,7 @@
     <MicrosoftNETCorePlatformsVersion>3.0.0-preview6.19259.1</MicrosoftNETCorePlatformsVersion>
     <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview6.19257.8</MicrosoftBclAsyncInterfacesVersion>
     <MicrosoftNETCoreAppVersion>3.0.0-preview5-27620-01</MicrosoftNETCoreAppVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19229.8</MicrosoftDotNetBuildTasksFeedVersion>
     <optimizationIBCCoreCLRVersion>99.99.99-master-20190509.1</optimizationIBCCoreCLRVersion>
     <optimizationPGOCoreCLRVersion>99.99.99-master-20190509.1</optimizationPGOCoreCLRVersion>
   </PropertyGroup>
diff --git a/eng/build-job.yml b/eng/build-job.yml
index ec91ba03cf..656d16f657 100644
--- a/eng/build-job.yml
+++ b/eng/build-job.yml
@@ -117,7 +117,7 @@ jobs:
             feedsToUse: config
             projects: 'src/.nuget/optdata/ibcmerge.csproj'
             nugetConfigPath: 'eng/internal/NuGet.config'
-            restoreDirectory: '$(Build.SourcesDirectory)\packages'
+            restoreDirectory: '$(Build.SourcesDirectory)\.packages'
             verbosityRestore: 'normal'
             externalFeedCredentials: 'dotnet-core-internal-tooling'
 
diff --git a/init-tools.cmd b/init-tools.cmd
index f7f7ff9395..4390b2637a 100644
--- a/init-tools.cmd
+++ b/init-tools.cmd
@@ -2,7 +2,7 @@
 setlocal
 
 set INIT_TOOLS_LOG=%~dp0init-tools.log
-if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages
+if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0.packages
 if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
 set DOTNET_PATH=%~dp0.dotnet\
 if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
diff --git a/init-tools.sh b/init-tools.sh
index cacf9e454d..6de204a50a 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -2,7 +2,7 @@
 
 __scriptpath=$(cd "$(dirname "$0")"; pwd -P)
 __init_tools_log="$__scriptpath/init-tools.log"
-__PACKAGES_DIR="$__scriptpath/packages"
+__PACKAGES_DIR="$__scriptpath/.packages"
 __TOOLRUNTIME_DIR="$__scriptpath/Tools"
 __DOTNET_PATH="$__scriptpath/.dotnet"
 __DOTNET_CMD="$__DOTNET_PATH/dotnet"
diff --git a/tests/dir.props b/tests/dir.props
index cb56369af5..9da3cb3791 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -42,7 +42,7 @@
     <CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)'==''">false</CopyNuGetImplementations>
     <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
     <SourceDir>$(ProjectDir)src\</SourceDir>
-    <PackagesDir>$(ProjectDir)..\packages\</PackagesDir>
+    <PackagesDir>$(ProjectDir)..\.packages\</PackagesDir>
     <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir>
     <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ProjectDir)..\.dotnet\</DotnetCliPath>
     <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46\</BuildToolsTaskDir>
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 1888d10735..5c4d1de625 100644
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
+    <CrossGenFiles Include="..\.packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh
index ff4231435f..68b60b23ba 100755
--- a/tests/scripts/arm32_ci_script.sh
+++ b/tests/scripts/arm32_ci_script.sh
@@ -326,7 +326,7 @@ function copy_to_emulator {
     __testDirFileBase="$__ARMEmulCoreclr/$testDirFileBase"
 
     sudo cp -R ./tests "$__ARMRootfsCoreclrPath/"
-    sudo cp -R ./packages "$__ARMRootfsCoreclrPath/"
+    sudo cp -R ./.packages "$__ARMRootfsCoreclrPath/"
     sudo cp -R ./Tools "$__ARMRootfsCoreclrPath/"
 
     #Copy corefx binary directories to the corefx root in the emulator (first native and then managed)
diff --git a/tests/setup-stress-dependencies.sh b/tests/setup-stress-dependencies.sh
index 56c37b20f8..65fb5637b3 100755
--- a/tests/setup-stress-dependencies.sh
+++ b/tests/setup-stress-dependencies.sh
@@ -79,7 +79,7 @@ echo "Running init-tools.sh"
 "${scriptDir}"/../init-tools.sh
 
 dotnet=$"${scriptDir}"/../.dotnet/dotnet
-packageDir="${scriptDir}"/../packages
+packageDir="${scriptDir}"/../.packages
 csprojPath="${scriptDir}"/src/Common/stress_dependencies/stress_dependencies.csproj
 
 if [ ! -e $dotnetCmd ]; then