Update BuildToolsVersion to 1021-01

Exit build.cmd with exit code
Add useServerGC parsing to build.sh

Moving installed packages out of bin dir

This was done to allow Packer.exe to work.

Changing install path to non-conditioned propertygroup

Build native packages after managed build of binaries

This is because the build packages step invokes the Run tool to determine the FilterToOSGroup on each platform respectively.

Author: karajas

.gitignore

@@ -173,6 +173,7 @@ ClientBin/
 node_modules/
 *.metaproj
 *.metaproj.tmp
+bin.localpkg/
 
 # RIA/Silverlight projects
 Generated_Code/

build.cmd

@@ -9,7 +9,7 @@ if NOT [%ERRORLEVEL%]==[0] exit /b 1
 call %~dp0build-managed.cmd -FilterToOSGroup=Windows_NT %*
 if NOT [%ERRORLEVEL%]==[0] exit /b 1
 call %~dp0build-tests.cmd %*
-if NOT [%ERRORLEVEL%]==[0] exit /b 1
+exit /b %ERRORLEVEL%
 
 :Usage
 echo.

build.proj

@@ -227,6 +227,8 @@
   <!-- Override CleanAllProjects from dir.traversal.targets and just remove the full BinDir -->
   <Target Name="CleanAllProjects">
     <RemoveDir Directories="$(BinDir)" />
+    <!-- Temporarily outside BinDir -->
+    <RemoveDir Directories="$(PackageInstallPath)" />
   </Target>
 
   <!-- Hook that can be used to insert custom build tasks to the build process such as setup and/or cleanup tasks -->

build.sh

@@ -23,11 +23,37 @@ fi
 
 __scriptpath=$(cd "$(dirname "$0")"; pwd -P)
 
+__ServerGC=0
+
+while :; do
+    if [ $# -le 0 ]; then
+        break
+    fi
+
+    lowerI="$(echo $1 | awk '{print tolower($0)}')"
+    case $lowerI in
+        useservergc)
+            __ServerGC=1
+            ;;
+        *)
+            __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
+    esac
+
+    shift
+done
+
+export CORECLR_SERVER_GC="$__ServerGC"
+
 "$__scriptpath/build-native.sh" $*
 if [ $? -ne 0 ];then
    exit 1
 fi
 
+"$__scriptpath/build-packages.sh" -DisableManagedPackage $*
+if [ $? -ne 0 ];then
+   exit 1
+fi
+
 "$__scriptpath/build-managed.sh" $*
 if [ $? -ne 0 ];then
    exit 1

dependencies.props

@@ -33,7 +33,7 @@
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <AppXRunnerVersion>1.0.3-prerelease-00925-01</AppXRunnerVersion>
+    <AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
     <XunitPerfAnalysisPackageVersion>1.0.0-alpha-build0040</XunitPerfAnalysisPackageVersion>
   </PropertyGroup>
 

dir.props

@@ -67,6 +67,8 @@
   <!-- Enable the analyzers for this repo -->
   <PropertyGroup>
     <EnableDotnetAnalyzers Condition="'$(EnableDotnetAnalyzers)'==''">true</EnableDotnetAnalyzers>
+    <!-- Temporarily outside BinDir -->
+    <PackageInstallPath>$(ProjectDir)bin.localpkg/</PackageInstallPath>
   </PropertyGroup>
 
   <!-- Provides package dependency version properties and verification/auto-upgrade configuration -->
@@ -84,7 +86,6 @@
 
   <PropertyGroup Condition="'$(BuildTestsAgainstPackages)' == 'true'">
     <!-- Packaging.targets is only included when full build.cmd is invoked. -->
-    <PackageInstallPath>$(BinDir)localpkg/</PackageInstallPath>
   </PropertyGroup>
 
   <!-- Import packaging props -->

src/Native/pkg/runtime.native.System.Data.SqlClient.sni/project.json

@@ -4,7 +4,7 @@
       "dependencies": {
         "runtime.win7-x64.runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24627-00",
         "runtime.win7-x86.runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24627-00",
-        "runtime.win10-arm64.runtime.native.System.Data.SqlClient.sni": "4.3.0-beta-24716-00"
+        "runtime.win10-arm64.runtime.native.System.Data.SqlClient.sni": "4.3.0-beta-24722-00"
       }
     }
   }

src/tests.builds

@@ -8,8 +8,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="*\tests\**\*.builds">
-      <BuildAllOSGroups Condition="'$(OSGroup)' != '' OR '$(FilterToOSGroup)' != '' ">false</BuildAllOSGroups>
-      <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == '' AND '$(DontFilterOsGroup)' != 'true'">$(OSEnvironment)</FilterToOSGroup>
+      <BuildAllOSGroups Condition="'$(OSGroup)' != '' OR '$(FilterToOSGroup)' != ''">false</BuildAllOSGroups>
+      <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup>
     </Project>
   </ItemGroup>