summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Perez Rodriguez <joperezr@microsoft.com>2018-01-30 15:25:54 -0800
committerGitHub <noreply@github.com>2018-01-30 15:25:54 -0800
commit2b5669894f3f4a38aca7e7da2f270961a531ba22 (patch)
treefd60f16a169ab7d802454fe75467c9ac8736b336
parent0099e62564790eaa8a09fa8c5b798b5401ef326c (diff)
downloadcoreclr-2b5669894f3f4a38aca7e7da2f270961a531ba22.tar.gz
coreclr-2b5669894f3f4a38aca7e7da2f270961a531ba22.tar.bz2
coreclr-2b5669894f3f4a38aca7e7da2f270961a531ba22.zip
Building non-Windows builds using the CLI's MSBuild (#16101)
* Building non-Windows builds using the CLI's MSBuild
-rw-r--r--BuildToolsVersion.txt2
-rw-r--r--DotnetCLIVersion.txt2
-rwxr-xr-xbuild-packages.sh2
-rwxr-xr-xbuild-test.sh2
-rwxr-xr-xbuild.sh6
-rw-r--r--dependencies.props4
-rwxr-xr-xinit-tools.sh4
7 files changed, 11 insertions, 11 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index fc801f6131..f0d963f972 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.1.0-prerelease-02427-01
+2.1.0-prerelease-02430-04
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
index 227cea2156..eca07e4c1a 100644
--- a/DotnetCLIVersion.txt
+++ b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.0.0
+2.1.2
diff --git a/build-packages.sh b/build-packages.sh
index 4de98e6db3..838f5bd7f3 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -121,7 +121,7 @@ else
export __DistroRid="$__HostDistroRid"
fi
-$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/packages.builds -DistroRid=$__DistroRid -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs
+$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/packages.builds -DistroRid=$__DistroRid -UseSharedCompilation=false -BuildNugetPackage=false -MsBuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log" $unprocessedBuildArgs
if [ $? -ne 0 ]
then
echo "ERROR: An error occurred while building packages; See build-packages.log for more details."
diff --git a/build-test.sh b/build-test.sh
index 491f6187be..2ccc3b663a 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -311,7 +311,7 @@ build_Tests_internal()
__msbuildErr="\"/flp2:ErrorsOnly;LogFile=${__BuildErr}\""
# Generate build command
- buildCommand="$__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog=${__msbuildLog} -MsBuildWrn=${__msbuildWrn} -MsBuildErr=${__msbuildErr} $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs"
+ buildCommand="$__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog=${__msbuildLog} -MsBuildWrn=${__msbuildWrn} -MsBuildErr=${__msbuildErr} -MsBuildEventLogging=\"/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log\" $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs"
echo "Building step '$stepName' via $buildCommand"
diff --git a/build.sh b/build.sh
index f10d5b81fb..b7a77e33cf 100755
--- a/build.sh
+++ b/build.sh
@@ -275,7 +275,7 @@ build_native()
__versionSourceFile="$intermediatesForBuild/version.cpp"
if [ $__SkipGenerateVersion == 0 ]; then
pwd
- "$__ProjectRoot/run.sh" build -Project=$__ProjectDir/build.proj -generateHeaderUnix -NativeVersionSourceFile=$__versionSourceFile $__RunArgs $__UnprocessedBuildArgs
+ "$__ProjectRoot/run.sh" build -Project=$__ProjectDir/build.proj -generateHeaderUnix -NativeVersionSourceFile=$__versionSourceFile -MsBuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log" $__RunArgs $__UnprocessedBuildArgs
else
# Generate the dummy version.cpp, but only if it didn't exist to make sure we don't trigger unnecessary rebuild
__versionSourceLine="static char sccsid[] __attribute__((used)) = \"@(#)No version information produced\";"
@@ -437,7 +437,7 @@ build_CoreLib()
__ExtraBuildArgs="$__ExtraBuildArgs -OptimizationDataDir=\"$__PackagesDir/optimization.$__BuildOS-$__BuildArch.IBC.CoreCLR/$__IbcOptDataVersion/data/\""
__ExtraBuildArgs="$__ExtraBuildArgs -EnableProfileGuidedOptimization=true"
fi
- $__ProjectRoot/run.sh build -Project=$__ProjectDir/build.proj -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false $__RunArgs $__ExtraBuildArgs $__UnprocessedBuildArgs
+ $__ProjectRoot/run.sh build -Project=$__ProjectDir/build.proj -MsBuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log" -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false $__RunArgs $__ExtraBuildArgs $__UnprocessedBuildArgs
if [ $? -ne 0 ]; then
echo "Failed to build managed components."
@@ -477,7 +477,7 @@ generate_NugetPackages()
echo "DistroRid is "$__DistroRid
echo "ROOTFS_DIR is "$ROOTFS_DIR
# Build the packages
- $__ProjectRoot/run.sh build -Project=$__SourceDir/.nuget/packages.builds -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false $__RunArgs $__UnprocessedBuildArgs
+ $__ProjectRoot/run.sh build -Project=$__SourceDir/.nuget/packages.builds -MsBuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log" -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false $__RunArgs $__UnprocessedBuildArgs
if [ $? -ne 0 ]; then
echo "Failed to generate Nuget packages."
diff --git a/dependencies.props b/dependencies.props
index 9e85f56ae9..05927e67df 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -25,7 +25,7 @@
<PropertyGroup>
<CoreFxCurrentRef>24b5bc6112a79756946da87bbd6f85178fc3753d</CoreFxCurrentRef>
<CoreClrCurrentRef>1c72931005703c5e509c1e3159d9378cbfea7862</CoreClrCurrentRef>
- <BuildToolsCurrentRef>24b5bc6112a79756946da87bbd6f85178fc3753d</BuildToolsCurrentRef>
+ <BuildToolsCurrentRef>8724971b85883e93b071f982175ecf5e0de7ef88</BuildToolsCurrentRef>
<PgoDataCurrentRef>b8102fb1b6ee0b61222eeeeddbd9e53ec1a695b8</PgoDataCurrentRef>
</PropertyGroup>
@@ -45,7 +45,7 @@
<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
- <FeedTasksPackageVersion>2.1.0-prerelease-02427-01</FeedTasksPackageVersion>
+ <FeedTasksPackageVersion>2.1.0-prerelease-02430-04</FeedTasksPackageVersion>
</PropertyGroup>
<!-- Package dependency verification/auto-upgrade configuration. -->
diff --git a/init-tools.sh b/init-tools.sh
index a408b772aa..1df4f25f60 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -157,11 +157,11 @@ export ILASMCOMPILER_VERSION=$__ILASM_VERSION
export NATIVE_TOOLS_RID=$__ILASM_RID
echo "Initializing BuildTools..."
-echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log
+echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> $__init_tools_log
# Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
chmod +x $__BUILD_TOOLS_PATH/init-tools.sh
-$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log
+$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR >> $__init_tools_log
if [ "$?" != "0" ]; then
echo "ERROR: An error occurred when trying to initialize the tools." 1>&2
display_error_message