Move MSBuild projects out of the native build scripts

eng/Subsets.props

@@ -61,7 +61,7 @@
     <DefaultInstallerSubsets>corehost-managed-depproj-pkgproj-bundle-installers-test</DefaultInstallerSubsets>
     <!-- TODO: Split into multiple sets. -->
     <DefaultLibrariesSubsets>all</DefaultLibrariesSubsets>
-    <DefaultCoreClrSubsets>all</DefaultCoreClrSubsets>
+    <DefaultCoreClrSubsets>runtime-corelib-tools-packages</DefaultCoreClrSubsets>
     <DefaultMonoSubsets>all</DefaultMonoSubsets>
 
     <_subsetCategory Condition="'$(SubsetCategory)' != ''">$(SubsetCategory.ToLowerInvariant())</_subsetCategory>
@@ -81,7 +81,10 @@
     <SubsetName Include="All" Category="Libraries" Description="The .NET libraries comprising the shared framework." />
 
     <!-- CoreClr -->
-    <SubsetName Include="All" Category="CoreClr" Description="The .NET runtime." />
+    <SubsetName Include="Runtime" Category="CoreClr" Description="The CoreCLR .NET runtime." />
+    <SubsetName Include="CoreLib" Category="CoreClr" Description="The managed System.Private.CoreLib library for CoreCLR." />
+    <SubsetName Include="Tools" Category="CoreClr" Description="Managed tools that support CoreCLR development and testing." />
+    <SubsetName Include="Packages" Category="CoreClr" Description="The projects that produce NuGet packages for the CoreCLR runtime, crossgen, and IL tools." />
 
     <!-- Mono -->
     <SubsetName Include="All" Category="Mono" Description="The Mono .NET runtime." />
@@ -106,6 +109,15 @@
     <CoreClrProjectToBuild>
       <AdditionalProperties>Configuration=$(CoreCLRConfiguration)</AdditionalProperties>
     </CoreClrProjectToBuild>
+    <CoreClrCoreLibProjectToBuild>
+      <AdditionalProperties>Configuration=$(CoreCLRConfiguration)</AdditionalProperties>
+    </CoreClrCoreLibProjectToBuild>
+    <CoreClrManagedToolsProjectToBuild>
+      <AdditionalProperties>Configuration=$(CoreCLRConfiguration)</AdditionalProperties>
+    </CoreClrManagedToolsProjectToBuild>
+    <CoreClrPackagesProjectToBuild>
+      <AdditionalProperties>Configuration=$(CoreCLRConfiguration)</AdditionalProperties>
+    </CoreClrPackagesProjectToBuild>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(MonoConfiguration)' != ''">
@@ -121,11 +133,28 @@
   </ItemDefinitionGroup>
 
   <!-- CoreClr sets -->
-  <ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('all'))">
+  <ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('corelib'))">
+    <CoreClrCoreLibProjectToBuild Include="$(CoreClrProjectRoot)src\System.Private.CoreLib\System.Private.CoreLib.csproj" BuildInParallel="false" />
+    <ProjectToBuild Include="@(CoreClrCoreLibProjectToBuild)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('runtime'))">
     <CoreClrProjectToBuild Include="$(CoreClrProjectRoot)coreclr.proj" BuildInParallel="false" />
     <ProjectToBuild Include="@(CoreClrProjectToBuild)" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('tools'))">
+    <CoreClrManagedToolsProjectToBuild Include="$(CoreClrProjectRoot)src\tools\runincontext\runincontext.csproj" />
+    <CoreClrManagedToolsProjectToBuild Include="$(CoreClrProjectRoot)src\tools\r2rdump\R2RDump.csproj" />
+    <CoreClrManagedToolsProjectToBuild Include="$(CoreClrProjectRoot)src\tools\ReadyToRun.SuperIlc\ReadyToRun.SuperIlc.csproj" />
+    <CoreClrManagedToolsProjectToBuild Include="$(CoreClrProjectRoot)src\tools\crossgen2\crossgen2\crossgen2.csproj" BuildInParallel="false" />
+    <ProjectToBuild Include="@(CoreClrManagedToolsProjectToBuild)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('packages'))">
+    <CoreClrPackagesProjectToBuild Include="$(CoreClrProjectRoot)src\.nuget\packages.builds" BuildInParallel="false" />
+    <ProjectToBuild Include="@(CoreClrPackagesProjectToBuild)" />
+  </ItemGroup>
   <!-- Mono sets -->
   <ItemGroup Condition="$(_subsetCategory.Contains('mono')) and $(_subset.Contains('all'))">
     <MonoProjectToBuild Include="$(MonoProjectRoot)mono.proj" BuildInParallel="false" />

eng/build.ps1

@@ -128,6 +128,8 @@ if ($null -ne $possibleDirToBuild -and $subsetCategory -eq "libraries") {
   }
 }
 
+$arch = [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()
+
 foreach ($argument in $PSBoundParameters.Keys)
 {
   switch($argument)
@@ -140,11 +142,13 @@ foreach ($argument in $PSBoundParameters.Keys)
     "framework"            { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())" }
     "os"                   { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
     "allconfigurations"    { $arguments += " /p:BuildAllConfigurations=true" }
-    "arch"                 { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }
+    "arch"                 { $arch = $PSBoundParameters[$argument]; $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }
     "properties"           { $arguments += " " + $properties }
     default                { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" }
   }
 }
 
+$env:__DistroRid="win-$arch"
+
 Invoke-Expression "& `"$PSScriptRoot/common/build.ps1`" $arguments"
 exit $lastExitCode

eng/build.sh

@@ -58,13 +58,104 @@ usage()
   echo "Arguments can also be passed in with a single hyphen."
 }
 
+initDistroRid()
+{
+    source $scriptroot/native/init-distro-rid.sh
+
+    local passedRootfsDir=""
+    local buildOs="$1"
+    local buildArch="$2"
+    local isCrossBuild="$3"
+    # For RID calculation purposes, say we are always a portable build
+    local isPortableBuild=1
+
+    # Only pass ROOTFS_DIR if __DoCrossArchBuild is specified.
+    if (( isCrossBuild == 1 )); then
+        passedRootfsDir=${ROOTFS_DIR}
+    fi
+    initDistroRidGlobal ${buildOs} ${buildArch} ${isPortableBuild} ${passedRootfsDir}
+}
+
 arguments=''
 cmakeargs=''
 extraargs=''
 build=false
 buildtests=false
 subsetCategory=''
 checkedPossibleDirectoryToBuild=false
+crossBuild=0
+os=''
+arch=''
+
+
+# Use uname to determine what the OS is.
+OSName=$(uname -s)
+case "$OSName" in
+    Darwin)
+        os=OSX
+        ;;
+
+    FreeBSD)
+        os=FreeBSD
+        ;;
+
+    Linux)
+        os=Linux
+        ;;
+
+    NetBSD)
+        os=NetBSD
+        ;;
+
+    OpenBSD)
+        os=OpenBSD
+        ;;
+
+    SunOS)
+        os=SunOS
+        ;;
+
+    *)
+        echo "Unsupported OS $OSName detected, configuring as if for Linux"
+        os=Linux
+        ;;
+esac
+
+# Use uname to determine what the CPU is.
+CPUName=$(uname -p)
+
+# Some Linux platforms report unknown for platform, but the arch for machine.
+if [[ "$CPUName" == "unknown" ]]; then
+    CPUName=$(uname -m)
+fi
+
+case "$CPUName" in
+    aarch64)
+        arch=arm64
+        ;;
+
+    amd64)
+        arch=x64
+        ;;
+
+    armv7l)
+        arch=arm
+        ;;
+
+    i686)
+        echo "Unsupported CPU $CPUName detected, build might not succeed!"
+        arch=x86
+        ;;
+
+    x86_64)
+        arch=x64
+        ;;
+
+    *)
+        echo "Unknown CPU $CPUName detected, configuring as if for x64"
+        arch=x64
+        ;;
+esac
 
 # Check if an action is passed in
 declare -a actions=("r" "restore" "b" "build" "buildtests" "rebuild" "t" "test" "pack" "sign" "publish" "clean")
@@ -87,6 +178,7 @@ while [[ $# > 0 ]]; do
       shift 2
       ;;
      -arch)
+      arch=$2
       arguments="$arguments /p:ArchGroup=$2 /p:TargetArchitecture=$2"
       shift 2
       ;;
@@ -101,6 +193,7 @@ while [[ $# > 0 ]]; do
       shift 2
       ;;
      -os)
+      os=$2
       arguments="$arguments /p:OSGroup=$2"
       shift 2
       ;;
@@ -139,6 +232,7 @@ while [[ $# > 0 ]]; do
       shift 2
       ;;
      -cross)
+      crossBuild=1
       arguments="$arguments /p:CrossBuild=True"
       shift 1
       ;;
@@ -185,6 +279,8 @@ if [ ${#actInt[@]} -eq 0 ]; then
     arguments="-restore -build $arguments"
 fi
 
+initDistroRid $os $arch $crossBuild
+
 # URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh.
 # In *proj files (XML docs), URL-encoded string are rendered in their decoded form.
 cmakeargs="${cmakeargs// /%20}"

eng/native/init-distro-rid.sh

@@ -40,6 +40,7 @@ initNonPortableDistroRid()
     local buildArch="$2"
     local isPortable="$3"
     local rootfsDir="$4"
+    local nonPortableBuildID=""
 
     if [ "$buildOs" = "Linux" ]; then
         if [ -e "${rootfsDir}/etc/os-release" ]; then
@@ -115,7 +116,10 @@ initDistroRidGlobal()
     local buildOs="$1"
     local buildArch="$2"
     local isPortable="$3"
-    local rootfsDir="$4"
+    local rootfsDir=""
+    if [ "$#" -ge 4 ]; then
+        rootfsDir="$4"
+    fi
 
     if [ -n "${rootfsDir}" ]; then
         # We may have a cross build. Check for the existance of the rootfsDir

eng/pipelines/coreclr/templates/build-job.yml

@@ -84,9 +84,13 @@ jobs:
         value: true
     - name: officialBuildIdArg
       value: ''
+    - name: officialBuildIdArcadeArg
+      value: ''
     - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       - name: officialBuildIdArg
         value: '-officialbuildid=$(Build.BuildNumber)'
+      - name: officialBuildIdArcadeArg
+        value: '/p:OfficialBuildId=$(Build.BuildNumber)'
     - name: enforcePgoArg
       value: ''
     # The EnforcePGO script is only supported on Windows and is not supported on arm or arm64.
@@ -119,13 +123,21 @@ jobs:
         parameters:
           installDotnet: true
 
-    # Build
+    # Build System.Private.CoreLib
+    - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subsetCategory coreclr -subset corelib $(crossArg) -arch $(archType) -c $(buildConfig) $(officialBuildIdArcadeArg)
+      displayName: Build System.Private.CoreLib
+
+    # Build CoreCLR
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: $(coreClrRepoRootDir)build$(scriptExt) $(buildConfig) $(archType) $(crossArg) -ci -skipnuget $(clangArg) $(stripSymbolsArg) $(officialBuildIdArg)
-        displayName: Build product
+      - script: $(coreClrRepoRootDir)build$(scriptExt) $(buildConfig) $(archType) $(crossArg) -ci $(clangArg) $(stripSymbolsArg) $(officialBuildIdArg)
+        displayName: Build CoreCLR Runtime
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - script: set __TestIntermediateDir=int&&$(coreClrRepoRootDir)build$(scriptExt) $(buildConfig) $(archType) -ci -skiptests -skipbuildpackages $(officialBuildIdArg) $(enforcePgoArg)
-        displayName: Build product
+      - script: set __TestIntermediateDir=int&&$(coreClrRepoRootDir)build$(scriptExt) $(buildConfig) $(archType) -ci $(officialBuildIdArg) $(enforcePgoArg)
+        displayName: Build CoreCLR Runtime
+
+    # Build managed tools
+    - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subsetCategory coreclr -subset tools $(crossArg) -arch $(archType) -c $(buildConfig) $(officialBuildIdArcadeArg)
+      displayName: Build managed tools
 
     # Build native test components
     - script: $(coreClrRepoRootDir)build-test$(scriptExt) skipmanaged $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(clangArg) skipgeneratelayout
@@ -176,7 +188,7 @@ jobs:
           SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat'
 
     # Build packages
-    - script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossPackagesArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig)
+    - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subsetCategory coreclr -subset packages $(crossArg) -arch $(archType) -c $(buildConfig) $(officialBuildIdArcadeArg)
       displayName: Build packages
 
     # Save packages using the prepare-signed-artifacts format.

eng/pipelines/coreclr/templates/xplat-job.yml

@@ -108,14 +108,10 @@ jobs:
 
     - ${{ if ne(parameters.crossrootfsDir, '') }}:
       - name: crossArg
-        value: 'cross'
-      - name: crossPackagesArg
-        value: '-__DoCrossArchBuild=1'
+        value: '-cross'
     - ${{ if eq(parameters.crossrootfsDir, '') }}:
       - name: crossArg
         value: ''
-      - name: crossPackagesArg
-        value: ''
 
     - ${{ each variable in parameters.variables }}:
       - ${{insert}}: ${{ variable }}

src/coreclr/CMakeLists.txt

@@ -189,5 +189,3 @@ endif (CLR_CMAKE_HOST_UNIX)
 # Add Product Directory
 #------------------------------
 add_subdirectory(src)
-
-include(definitionsconsistencycheck.cmake)