New Configuration System

eng/Version.Details.xml

@@ -82,6 +82,10 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20079.8">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20079.8">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>

eng/build.ps1

@@ -137,7 +137,7 @@ foreach ($argument in $PSBoundParameters.Keys)
     "test"                 { $arguments += " -test" }
     "configuration"        { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" }
     "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" }
-    "framework"            { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())" }
+    "framework"            { $arguments += " /p:BuildTargetFramework=$($PSBoundParameters[$argument].ToLowerInvariant())" }
     "os"                   { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
     "allconfigurations"    { $arguments += " /p:BuildAllConfigurations=true" }
     "arch"                 { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }

eng/build.sh

@@ -97,7 +97,7 @@ while [[ $# > 0 ]]; do
       ;;
      -framework|-f)
       val="$(echo "$2" | awk '{print tolower($0)}')"
-      arguments="$arguments /p:TargetGroup=$val"
+      arguments="$arguments /p:BuildTargetFramework=$val"
       shift 2
       ;;
      -os)

eng/depProj.common.targets

@@ -0,0 +1,5 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project>
+  <Import Condition="'$(IsCrossTargetingBuild)' != 'true'" Project="depProj.targets" />
+  <Import Condition="'$(IsCrossTargetingBuild)' == 'true'" Project="$(MSBuildExtensionsPath)Microsoft.Common.CrossTargeting.targets" />
+</Project>

eng/depProj.targets

@@ -56,6 +56,9 @@ See the LICENSE file in the project root for more information.
     <CopyNuGetImplementations>true</CopyNuGetImplementations>
   </PropertyGroup>
 
+  <!-- This file results in importing the Build Target. -->
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+
   <Target Name="RemoveImplicitPackageReferences">
     <ItemGroup>
       <!-- Remove all implicit framework packages, depprojs are meant to be wholly explicit -->

eng/illink.targets

@@ -35,23 +35,23 @@
        Must be enabled by setting BinPlaceILLinkTrimAssembly=true
   --> 
   <ItemGroup Condition="'$(BinPlaceILLinkTrimAssembly)' == 'true'">
-    <BinPlaceConfiguration Include="$(BuildConfiguration)">
+    <BinPlaceTargetFramework Include="$(BuildConfiguration)">
       <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildConfiguration)/trimmed</RuntimePath>
       <ItemName>TrimmedItem</ItemName>
-    </BinPlaceConfiguration>
-    <BinPlaceConfiguration Include="$(BuildConfiguration)">
+    </BinPlaceTargetFramework>
+    <BinPlaceTargetFramework Include="$(BuildConfiguration)">
       <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildConfiguration)/reports</RuntimePath>
       <ItemName>TrimmingReport</ItemName>
-    </BinPlaceConfiguration>
-    <BinPlaceConfiguration Include="$(BuildConfiguration)">
+    </BinPlaceTargetFramework>
+    <BinPlaceTargetFramework Include="$(BuildConfiguration)">
       <RuntimePath>$(ArtifactsBinDir)ILLinkTrimAssembly/$(BuildConfiguration)/pretrimmed</RuntimePath>
       <ItemName>PreTrimmedItem</ItemName>
-    </BinPlaceConfiguration>
+    </BinPlaceTargetFramework>
   </ItemGroup>
 
   <Target Name="_SetILLinkTrimAssembly" 
           Condition="'$(ILLinkTrimAssembly)' == ''"
-          DependsOnTargets="GetBinPlaceConfiguration">
+          DependsOnTargets="GetBinPlaceTargetFramework">
     <PropertyGroup>
       <!-- Currently ILLink cannot handle type projections from Windows.winmd, disable if the project references it -->
       <ILLinkTrimAssembly Condition="'%(ReferencePath.FileName)%(ReferencePath.Extension)' == 'Windows.winmd'">false</ILLinkTrimAssembly>

eng/liveBuilds.targets

@@ -1,9 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <CoreCLROSGroup Condition="'$(CoreCLROSGroup)' == ''">$(OSGroup)</CoreCLROSGroup>
-    <MonoOSGroup Condition="'$(MonoOSGroup)' == ''">$(OSGroup)</MonoOSGroup>
-    <LibrariesOSGroup Condition="'$(LibrariesOSGroup)' == ''">$(OSGroup)</LibrariesOSGroup>
+    <CoreCLROSGroup Condition="'$(CoreCLROSGroup)' == ''">$(BuildOS)</CoreCLROSGroup>
+    <MonoOSGroup Condition="'$(MonoOSGroup)' == ''">$(BuildOS)</MonoOSGroup>
+    <LibrariesOSGroup Condition="'$(LibrariesOSGroup)' == ''">$(BuildOS)</LibrariesOSGroup>
     <LibrariesConfiguration Condition="'$(LibrariesConfiguration)' == ''">$(Configuration)</LibrariesConfiguration>
 
     <LibrariesOSGroupConfigurationArchitecture Condition="'$(LibrariesOSGroupConfigurationArchitecture)' == ''">$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)</LibrariesOSGroupConfigurationArchitecture>

eng/pipelines/libraries/base-job.yml

@@ -71,7 +71,7 @@ jobs:
 
         - ${{ if ne(parameters.framework, '') }}:
           - _finalFrameworkArg: -framework ${{ parameters.framework }}
-          - _extraHelixArguments: /p:TargetGroup=${{ parameters.framework }}
+          - _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}
 
         - ${{ if eq(parameters.framework, 'allConfigurations') }}:
           - _finalFrameworkArg: -allConfigurations