diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2019-05-10 14:07:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 14:07:11 -0700 |
| commit | 44d22bd22ffc72ec0a89b50b7de96b45a470b1e9 (patch) | |
| tree | 83a2a4b700a519d05de29d5b2dd35058a600367f /tests | |
| parent | c746a224d029f84556298893e8f2789df4bc3dda (diff) | |
| download | coreclr-44d22bd22ffc72ec0a89b50b7de96b45a470b1e9.tar.gz coreclr-44d22bd22ffc72ec0a89b50b7de96b45a470b1e9.tar.bz2 coreclr-44d22bd22ffc72ec0a89b50b7de96b45a470b1e9.zip | |
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"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dir.props | 2 | ||||
| -rw-r--r-- | tests/publishdependency.targets | 2 | ||||
| -rwxr-xr-x | tests/scripts/arm32_ci_script.sh | 2 | ||||
| -rwxr-xr-x | tests/setup-stress-dependencies.sh | 2 |
4 files changed, 4 insertions, 4 deletions
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 |