Multi-targeting with TargetFrameworks (dotnet#6003)

Author: michaelgsharp

Diff for: .vsts-dotnet-ci.yml

@@ -25,12 +25,12 @@ jobs:
     container: UbuntuCrossArmContainer
     customMatrixes:
       Debug_Build:
-        _configuration: Debug-netcoreapp3_1
+        _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
         _targetFramework: netcoreapp3.1
       Release_Build:
-        _configuration: Release-netcoreapp3_1
+        _configuration: Release
         _config_short: RI
         _includeBenchmarkData: true
         _targetFramework: netcoreapp3.1
@@ -47,12 +47,12 @@ jobs:
     container: UbuntuCrossArm64Container
     customMatrixes:
       Debug_Build:
-        _configuration: Debug-netcoreapp3_1
+        _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
         _targetFramework: netcoreapp3.1
       Release_Build:
-        _configuration: Release-netcoreapp3_1
+        _configuration: Release
         _config_short: RI
         _includeBenchmarkData: true
         _targetFramework: netcoreapp3.1
@@ -66,25 +66,14 @@ jobs:
     name: Centos_x64_NetCoreApp31
     buildScript: ./build.sh
     container: CentosContainer
-    customMatrixes:
-      Debug_Build:
-        _configuration: Debug-netcoreapp3_1
-        _config_short: DI
-        _includeBenchmarkData: false
-        _targetFramework: netcoreapp3.1
-      Release_Build:
-        _configuration: Release-netcoreapp3_1
-        _config_short: RI
-        _includeBenchmarkData: true
-        _targetFramework: netcoreapp3.1
     innerLoop: true
     pool:
       vmImage: ubuntu-18.04
     helixQueue: [email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Ubuntu_x64_NetCoreApp21
+    name: Ubuntu_x64_NetCoreApp31
     buildScript: ./build.sh
     container: UbuntuContainer
     innerLoop: true
@@ -94,7 +83,7 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: MacOS_x64_NetCoreApp21
+    name: MacOS_x64_NetCoreApp31
     buildScript: ./build.sh
     innerLoop: true
     pool:
@@ -104,52 +93,30 @@ jobs:
 - template: /build/ci/job-template.yml
   parameters:
     architecture: arm64
-    name: MacOS_cross_arm64_NetCoreApp21
+    name: MacOS_cross_arm64_Net6
     buildScript: ./build.sh
     customMatrixes:
       Debug_Build:
-        _configuration: Debug-netcoreapp3_1
+        _configuration: Debug
         _config_short: DI
         _includeBenchmarkData: false
-        _targetFramework: netcoreapp3.1
+        _targetFramework: net6.0
       Release_Build:
-        _configuration: Release-netcoreapp3_1
+        _configuration: Release
         _config_short: RI
         _includeBenchmarkData: true
-        _targetFramework: netcoreapp3.1
+        _targetFramework: net6.0
     innerLoop: true
     pool:
       vmImage: macOS-10.15
-    testTargetFramework: net6.0
     helixQueue: OSX.1100.Arm64.Open
 
 - template: /build/ci/job-template.yml
   parameters:
     name: Windows_x64_NetCoreApp31
     buildScript: build.cmd
-    customMatrixes:
-      Debug_Build:
-        _configuration: Debug-netcoreapp3_1
-        _config_short: DI
-        _includeBenchmarkData: false
-        _targetFramework: netcoreapp3.1
-      Release_Build:
-        _configuration: Release-netcoreapp3_1
-        _config_short: RI
-        _includeBenchmarkData: true
-        _targetFramework: netcoreapp3.1
-    innerLoop: true
-    vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0"
-    pool:
-      vmImage: windows-2019
-    helixQueue: Windows.10.Amd64.Open
-
-- template: /build/ci/job-template.yml
-  parameters:
-    name: Windows_x64_NetCoreApp21
-    buildScript: build.cmd
     innerLoop: true
-    vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
+    vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
     pool:
       vmImage: windows-2019
     helixQueue: Windows.10.Amd64.Open
@@ -160,15 +127,15 @@ jobs:
     buildScript: build.cmd
     customMatrixes:
       Debug_Build:
-        _configuration: Debug-netfx
+        _configuration: Debug
         _config_short: DFX
         _includeBenchmarkData: false
-        _targetFramework: win-x64
+        _targetFramework: net461
       Release_Build:
-        _configuration: Release-netfx
+        _configuration: Release
         _config_short: RFX
         _includeBenchmarkData: false
-        _targetFramework: win-x64
+        _targetFramework: net461
     innerLoop: true
     vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
     pool:
@@ -177,11 +144,11 @@ jobs:
 
 - template: /build/ci/job-template.yml
   parameters:
-    name: Windows_x86_NetCoreApp21
+    name: Windows_x86_NetCoreApp31
     architecture: x86
     buildScript: build.cmd
     innerLoop: true
-    vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1"
+    vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.1"
     pool:
       vmImage: windows-2019
     helixQueue: Windows.10.Amd64.Open

Diff for: Directory.Build.props

@@ -22,7 +22,6 @@
 
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
-    <Configurations>Debug;Release;Debug-netcoreapp3_1;Release-netcoreapp3_1;Debug-netfx;Release-netfx</Configurations>
     <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</TargetArchitecture>
     <TargetArchitecture>$(TargetArchitecture.ToLower())</TargetArchitecture>