summaryrefslogtreecommitdiff
path: root/build-test.sh
diff options
context:
space:
mode:
authorSteve MacLean <stmaclea@microsoft.com>2019-03-02 04:07:35 (GMT)
committerGitHub <noreply@github.com>2019-03-02 04:07:35 (GMT)
commit42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e (patch)
tree17cb448a25ea78394faba09f2f4b1b0b2b961183 /build-test.sh
parentc1801e85024add717f518feb6a9caed60d54500f (diff)
downloadcoreclr-42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e.zip
coreclr-42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e.tar.gz
coreclr-42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e.tar.bz2
Use arcade's version of dotnet to build (#22755)
* Use arcade dotnet * Add cmake_msbuild.cmd Move msbuild.cmd to cmake_msbuild.bat Document intent that this file is only used to resolve Windows cmake dependency on desktop msbuild.exe Remove one instance of msbuild.cmd * Fix inittools.cmd * Remove spurious setup_vs_tools.cmd calls
Diffstat (limited to 'build-test.sh')
-rwxr-xr-xbuild-test.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/build-test.sh b/build-test.sh
index 3b3ff61..fe86703 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -64,7 +64,6 @@ build_test_wrappers()
__Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity"
nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/runtest.proj\" /p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/ /p:BuildWrappers=true /p:TargetsWindows=false $__Logging /p:__BuildOS=$__BuildOS /p:__BuildType=$__BuildType /p:__BuildArch=$__BuildArch"
- echo "$nextCommand"
eval $nextCommand
if [ $? -ne 0 ]; then
@@ -587,7 +586,7 @@ __SourceDir="$__ProjectDir/src"
__PackagesDir="$__ProjectDir/packages"
__RootBinDir="$__ProjectDir/bin"
__BuildToolsDir="$__ProjectDir/Tools"
-__DotNetCli="${__BuildToolsDir}/dotnetcli/dotnet"
+__DotNetCli="$__ProjectDir/dotnet.sh"
__UnprocessedBuildArgs=
__CommonMSBuildArgs=
__MSBCleanBuildArgs=
@@ -879,9 +878,6 @@ initTargetDistroRid
# Override tool directory
-__CoreClrVersion=1.1.0
-__sharedFxDir=$__BuildToolsDir/dotnetcli/shared/Microsoft.NETCore.App/$__CoreClrVersion/
-
if [[ (-z "$__GenerateLayoutOnly") && (-z "$__GenerateTestHostOnly") && (-z "$__BuildTestWrappersOnly") ]]; then
build_Tests
elif [ ! -z "$__BuildTestWrappersOnly" ]; then