diff --git a/NuGet.config b/NuGet.config index 33e9d870a58e..2ab3c101077b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,5 +1,9 @@ + + + + diff --git a/build-test.cmd b/build-test.cmd index 424232ebf27f..85af0d2e0ae7 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 93a19800d3cb..b53a99f70a86 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 5c517eeb0ab0..be43dea77581 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 a07f06af683f..bf2ed184ed0b 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 acd84e7baeea..190cf6c6de9e 100644 --- a/dir.common.props +++ b/dir.common.props @@ -6,7 +6,17 @@ $(MSBuildThisFileDirectory) - $(CoreclrDir)/packages + $(CoreclrDir)/.packages + + + $(PackagesDir) + + + + + $(PackagesDir) + $(PackagesDir) @@ -33,9 +43,4 @@ $(BuildOS).$(BuildArch).$(BuildType) - - - $(PackagesDir) - - diff --git a/dir.props b/dir.props index 2792ac731b30..4da47073fccd 100644 --- a/dir.props +++ b/dir.props @@ -17,10 +17,9 @@ $(OS) - + - Portable - true + Portable @@ -55,7 +54,7 @@ $(DotNetRestorePackagesPath) $(__PackagesDir)\ - $(ProjectDir)packages\ + $(ProjectDir)\.packages\ $(__RootBinDir)\ $(ProjectDir)bin\ diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e32bc0b8749..e35c3228f8a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,8 +11,7 @@ https://github.com/dotnet/arcade bda52d7619f9420de46f2c39ffc972864bbcab63 - - diff --git a/eng/Versions.props b/eng/Versions.props index 373257e88209..17dc5469c45f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,6 +13,7 @@ 3.0.0-preview6.19259.1 1.0.0-preview6.19257.8 3.0.0-preview5-27620-01 + 2.2.0-beta.19229.8 99.99.99-master-20190509.1 99.99.99-master-20190509.1 diff --git a/eng/build-job.yml b/eng/build-job.yml index ec91ba03cf7d..656d16f6574d 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 f7f7ff9395cd..4390b2637aaf 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 cacf9e454d05..6de204a50a70 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 cb56369af5f0..9da3cb3791a8 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -42,7 +42,7 @@ false $(MSBuildThisFileDirectory) $(ProjectDir)src\ - $(ProjectDir)..\packages\ + $(ProjectDir)..\.packages\ $(ProjectDir)..\Tools\ $(ProjectDir)..\.dotnet\ $(ToolsDir)net46\ diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 1888d107356e..5c4d1de625d6 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -31,7 +31,7 @@ - + diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index ff4231435f90..68b60b23ba89 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 56c37b20f83e..65fb5637b3f4 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