build the TargetingPack package as part of build-packages scripts

Commit migrated from https://github.com/dotnet/coreclr/commit/c89c893bf1162457deaf5d80971799d770fa92ce

diff --git a/src/coreclr/build-packages.cmd b/src/coreclr/build-packages.cmd
index 5429581956afbab688af68f801572f8b17b38ca1..3552ab2ae8e23da12b7906b8dd563390dbabc91e 100644 (file)
--- a/src/coreclr/build-packages.cmd
+++ b/src/coreclr/build-packages.cmd
@@ -51,6 +51,15 @@ if NOT [!ERRORLEVEL!]==[0] (
   exit /b 1
 )
 
+rem Build the TargetingPack package
+set __msbuildArgs="%__ProjectDir%\src\.nuget\Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" !allargs! 
+echo msbuild.exe %__msbuildArgs% !options! >> %packagesLog%
+call msbuild.exe %__msbuildArgs% !options!
+if NOT [!ERRORLEVEL!]==[0] (
+  echo ERROR: An error occurred while building packages, see %packagesLog% for more details.
+  exit /b 1
+)
+
 echo Done Building Packages.
 exit /b
 

diff --git a/src/coreclr/build-packages.sh b/src/coreclr/build-packages.sh
index 0403c3f1f0ad5a7269ac5783df1f85caa10aa2c3..baa6516ec86eebd375e8fa7ad791c23ec230c54c 100755 (executable)
--- a/src/coreclr/build-packages.sh
+++ b/src/coreclr/build-packages.sh
@@ -150,6 +150,15 @@ fi
     # Build the ILDAsm package
     $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$binclashlog" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false
 
+if [ $? -ne 0 ]; then
+    echo -e "\nAn error occurred. Aborting build-packages.sh ." >> $build_packages_log
+    echo "ERROR: An error occurred while building packages, see $build_packages_log for more details."
+    exit 1
+fi
+
+    # Build the TargetingPack package
+    $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src\.nuget\Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$binclashlog" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false
+
 if [ $? -ne 0 ]; then
     echo -e "\nAn error occurred. Aborting build-packages.sh ." >> $build_packages_log
     echo "ERROR: An error occurred while building packages, see $build_packages_log for more details."