From 1a514bc442a078f3d3779218664c103d77f75005 Mon Sep 17 00:00:00 2001
From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
Date: Tue, 13 Dec 2016 12:42:19 -0500
Subject: [PATCH] Rename cross-targeting to multi-targeting

---
 .../Microsoft.Build.Runtime.nuspec            |   5 +-
 setup/files.swr                               |   6 +
 src/XMakeTasks/Microsoft.Build.Tasks.csproj   |  20 ++-
 .../Microsoft.CSharp.CrossTargeting.targets   |  12 +-
 .../Microsoft.CSharp.MultiTargeting.targets   |  24 +++
 src/XMakeTasks/Microsoft.CSharp.targets       |  10 +-
 .../Microsoft.Common.CrossTargeting.targets   | 140 +-----------------
 .../Microsoft.Common.CurrentVersion.targets   |   8 +-
 .../Microsoft.Common.MultiTargeting.targets   | 138 +++++++++++++++++
 ...crosoft.VisualBasic.CrossTargeting.targets |  14 +-
 ...crosoft.VisualBasic.MultiTargeting.targets |  24 +++
 src/XMakeTasks/Microsoft.VisualBasic.targets  |  10 +-
 12 files changed, 236 insertions(+), 175 deletions(-)
 create mode 100644 src/XMakeTasks/Microsoft.CSharp.MultiTargeting.targets
 create mode 100644 src/XMakeTasks/Microsoft.Common.MultiTargeting.targets
 create mode 100644 src/XMakeTasks/Microsoft.VisualBasic.MultiTargeting.targets

diff --git a/build/NuGetPackages/Microsoft.Build.Runtime.nuspec b/build/NuGetPackages/Microsoft.Build.Runtime.nuspec
index 67f2f319a06..4a788445153 100644
--- a/build/NuGetPackages/Microsoft.Build.Runtime.nuspec
+++ b/build/NuGetPackages/Microsoft.Build.Runtime.nuspec
@@ -37,12 +37,14 @@
     -->
     <file src="$configuration$\Output\MSBuild.exe" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\MSBuild.exe.config" target="contentFiles\any\net46\" />
+    <file src="$configuration$\Output\Microsoft.Common.MultiTargeting.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.Common.CrossTargeting.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.Common.CurrentVersion.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.Common.overridetasks" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.Common.props" target="contentFiles\any\net46\$targetMSBuildToolsVersion$\" />
     <file src="$configuration$\Output\Microsoft.Common.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.Common.tasks" target="contentFiles\any\net46\" />
+    <file src="$configuration$\Output\Microsoft.CSharp.MultiTargeting.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.CSharp.CrossTargeting.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.CSharp.CurrentVersion.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.CSharp.targets" target="contentFiles\any\net46\" />
@@ -52,6 +54,7 @@
     <file src="$configuration$\Output\Microsoft.NETFramework.props" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.NETFramework.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.ServiceModel.targets" target="contentFiles\any\net46\" />
+    <file src="$configuration$\Output\Microsoft.VisualBasic.MultiTargeting.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.VisualBasic.CrossTargeting.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.VisualBasic.CurrentVersion.targets" target="contentFiles\any\net46\" />
     <file src="$configuration$\Output\Microsoft.VisualBasic.targets" target="contentFiles\any\net46\" />
@@ -89,4 +92,4 @@
     <file src="$configuration$-NetCore\Output\Microsoft.VisualStudioVersion.v12.Common.props" target="contentFiles\any\netcoreapp1.0\" />
     <file src="$configuration$-NetCore\Output\Microsoft.VisualStudioVersion.v14.Common.props" target="contentFiles\any\netcoreapp1.0\" />
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/setup/files.swr b/setup/files.swr
index 69a155c7ab6..4a2d2f401da 100644
--- a/setup/files.swr
+++ b/setup/files.swr
@@ -23,11 +23,13 @@ folder InstallDir:\MSBuild\15.0\Bin
   file source=$(X86BinPath)System.Threading.Tasks.Dataflow.dll vs.file.ngen=yes
   file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngen=yes
   file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets
+  file source=$(X86BinPath)Microsoft.Common.MultiTargeting.targets
   file source=$(X86BinPath)Microsoft.Common.CrossTargeting.targets
   file source=$(X86BinPath)Microsoft.Common.overridetasks
   file source=$(X86BinPath)Microsoft.Common.targets
   file source=$(X86BinPath)Microsoft.Common.tasks
   file source=$(X86BinPath)Microsoft.CSharp.CurrentVersion.targets
+  file source=$(X86BinPath)Microsoft.CSharp.MultiTargeting.targets
   file source=$(X86BinPath)Microsoft.CSharp.CrossTargeting.targets
   file source=$(X86BinPath)Microsoft.CSharp.targets
   file source=$(X86BinPath)Microsoft.NetFramework.CurrentVersion.props
@@ -35,6 +37,7 @@ folder InstallDir:\MSBuild\15.0\Bin
   file source=$(X86BinPath)Microsoft.NetFramework.props
   file source=$(X86BinPath)Microsoft.NetFramework.targets
   file source=$(X86BinPath)Microsoft.VisualBasic.CurrentVersion.targets
+  file source=$(X86BinPath)Microsoft.VisualBasic.MultiTargeting.targets
   file source=$(X86BinPath)Microsoft.VisualBasic.CrossTargeting.targets
   file source=$(X86BinPath)Microsoft.VisualBasic.targets
   file source=$(X86BinPath)MSBuild.rsp
@@ -150,11 +153,13 @@ folder InstallDir:\MSBuild\15.0\Bin\amd64
   file source=$(X86BinPath)System.Threading.Tasks.Dataflow.dll vs.file.ngen=yes
   file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngen=yes
   file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets
+  file source=$(X86BinPath)Microsoft.Common.MultiTargeting.targets
   file source=$(X86BinPath)Microsoft.Common.CrossTargeting.targets
   file source=$(X86BinPath)Microsoft.Common.overridetasks
   file source=$(X86BinPath)Microsoft.Common.targets
   file source=$(X86BinPath)Microsoft.Common.tasks
   file source=$(X86BinPath)Microsoft.CSharp.CurrentVersion.targets
+  file source=$(X86BinPath)Microsoft.CSharp.MultiTargeting.targets
   file source=$(X86BinPath)Microsoft.CSharp.CrossTargeting.targets
   file source=$(X86BinPath)Microsoft.CSharp.targets
   file source=$(X86BinPath)Microsoft.NetFramework.CurrentVersion.props
@@ -162,6 +167,7 @@ folder InstallDir:\MSBuild\15.0\Bin\amd64
   file source=$(X86BinPath)Microsoft.NetFramework.props
   file source=$(X86BinPath)Microsoft.NetFramework.targets
   file source=$(X86BinPath)Microsoft.VisualBasic.CurrentVersion.targets
+  file source=$(X86BinPath)Microsoft.VisualBasic.MultiTargeting.targets
   file source=$(X86BinPath)Microsoft.VisualBasic.CrossTargeting.targets
   file source=$(X86BinPath)Microsoft.VisualBasic.targets
   file source=$(X86BinPath)MSBuild.rsp
diff --git a/src/XMakeTasks/Microsoft.Build.Tasks.csproj b/src/XMakeTasks/Microsoft.Build.Tasks.csproj
index 559efc46a12..105bf973179 100644
--- a/src/XMakeTasks/Microsoft.Build.Tasks.csproj
+++ b/src/XMakeTasks/Microsoft.Build.Tasks.csproj
@@ -704,9 +704,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Microsoft.Common.CrossTargeting.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Microsoft.ServiceModel.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -730,6 +727,10 @@
     <Content Include="Microsoft.Common.CurrentVersion.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Microsoft.Common.MultiTargeting.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Microsoft.Common.CrossTargeting.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -740,6 +741,9 @@
     <Content Include="Microsoft.CSharp.CurrentVersion.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Microsoft.CSharp.MultiTargeting.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Microsoft.CSharp.CrossTargeting.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -755,6 +759,9 @@
     <Content Include="Microsoft.VisualBasic.CurrentVersion.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Microsoft.VisualBasic.MultiTargeting.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Microsoft.VisualBasic.CrossTargeting.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -846,6 +853,9 @@
     <DataFile Include="Microsoft.Common.CrossTargeting.targets">
       <SubType>Designer</SubType>
     </DataFile>
+    <DataFile Include="Microsoft.Common.MultiTargeting.targets">
+      <SubType>Designer</SubType>
+    </DataFile>
     <DataFile Include="Microsoft.NETFramework.targets" />
     <DataFile Include="Microsoft.NETFramework.CurrentVersion.targets" />
     <DataFile Include="Microsoft.NETFramework.props">
@@ -857,9 +867,11 @@
     <DataFile Include="Microsoft.CSharp.targets" />
     <DataFile Include="Microsoft.CSharp.CurrentVersion.targets" />
     <DataFile Include="Microsoft.CSharp.CrossTargeting.targets" />
+    <DataFile Include="Microsoft.CSharp.MultiTargeting.targets" />
     <DataFile Include="Microsoft.VisualBasic.targets" />
     <DataFile Include="Microsoft.VisualBasic.CurrentVersion.targets" />
     <DataFile Include="Microsoft.VisualBasic.CrossTargeting.targets" />
+    <DataFile Include="Microsoft.VisualBasic.MultiTargeting.targets" />
     <CopyFile Include="@(DataFile)">
       <DestFolder>$(SuiteBinPath)</DestFolder>
     </CopyFile>
@@ -982,4 +994,4 @@
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="..\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/XMakeTasks/Microsoft.CSharp.CrossTargeting.targets b/src/XMakeTasks/Microsoft.CSharp.CrossTargeting.targets
index 68d1aa0797a..3418da5371a 100644
--- a/src/XMakeTasks/Microsoft.CSharp.CrossTargeting.targets
+++ b/src/XMakeTasks/Microsoft.CSharp.CrossTargeting.targets
@@ -10,15 +10,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 
+<!-- These targets are deprecated, forward to new targets -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed. -->
-  <!-- Import design time targets before the common crosstargeting targets, which import targets from Nuget. -->
-  <PropertyGroup>
-     <CSharpDesignTimeTargetsPath Condition="'$(CSharpDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.CSharp.DesignTime.targets</CSharpDesignTimeTargetsPath>
-  </PropertyGroup>
-  <Import Project="$(CSharpDesignTimeTargetsPath)" Condition="'$(CSharpDesignTimeTargetsPath)' != '' and Exists('$(CSharpDesignTimeTargetsPath)')" />
-
-  <Import Project="Microsoft.Common.CrossTargeting.targets" />
-
+  <Import Project="Microsoft.CSharp.MultiTargeting.targets" />
 </Project>
diff --git a/src/XMakeTasks/Microsoft.CSharp.MultiTargeting.targets b/src/XMakeTasks/Microsoft.CSharp.MultiTargeting.targets
new file mode 100644
index 00000000000..70e44ea3e1a
--- /dev/null
+++ b/src/XMakeTasks/Microsoft.CSharp.MultiTargeting.targets
@@ -0,0 +1,24 @@
+<!--
+***********************************************************************************************
+Microsoft.CSharp.MultiTargeting.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (C) Microsoft Corporation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed. -->
+  <!-- Import design time targets before the common multitargeting targets, which import targets from Nuget. -->
+  <PropertyGroup>
+     <CSharpDesignTimeTargetsPath Condition="'$(CSharpDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.CSharp.DesignTime.targets</CSharpDesignTimeTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(CSharpDesignTimeTargetsPath)" Condition="'$(CSharpDesignTimeTargetsPath)' != '' and Exists('$(CSharpDesignTimeTargetsPath)')" />
+
+  <Import Project="Microsoft.Common.MultiTargeting.targets" />
+
+</Project>
diff --git a/src/XMakeTasks/Microsoft.CSharp.targets b/src/XMakeTasks/Microsoft.CSharp.targets
index 69994d096bc..e4827c1bd49 100644
--- a/src/XMakeTasks/Microsoft.CSharp.targets
+++ b/src/XMakeTasks/Microsoft.CSharp.targets
@@ -17,11 +17,13 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <!-- 
-        We are doing a cross-targeting build if there is no list of target frameworks specified
+        We are doing a multi-targeting build if there is no list of target frameworks specified
         nor is there a current target framework being built individually. In that case, this import is
-        redirected to Microsoft.CSharp.CrossTargeting.targets.
+        redirected to Microsoft.CSharp.MultiTargeting.targets.
    -->
    <PropertyGroup Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">
+      <IsMultiTargetingBuild>true</IsMultiTargetingBuild>
+      <!-- back-compat for deprecated IsCrossTargetingBuild property -->
       <IsCrossTargetingBuild>true</IsCrossTargetingBuild>
    </PropertyGroup>
 
@@ -49,9 +51,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             <CscToolPath Condition="'$(CscToolPath)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">$(MsBuildFrameworkToolsPath)</CscToolPath>
          </PropertyGroup>
       </When>
-      <When Condition="'$(IsCrossTargetingBuild)' == 'true'">
+      <When Condition="'$(IsMultiTargetingBuild)' == 'true'">
          <PropertyGroup>
-            <CSharpTargetsPath>$(MSBuildToolsPath)\Microsoft.CSharp.CrossTargeting.targets</CSharpTargetsPath>
+            <CSharpTargetsPath>$(MSBuildToolsPath)\Microsoft.CSharp.MultiTargeting.targets</CSharpTargetsPath>
           </PropertyGroup>
       </When>
       <Otherwise>
diff --git a/src/XMakeTasks/Microsoft.Common.CrossTargeting.targets b/src/XMakeTasks/Microsoft.Common.CrossTargeting.targets
index d4ede1aa369..df075b2f9d4 100644
--- a/src/XMakeTasks/Microsoft.Common.CrossTargeting.targets
+++ b/src/XMakeTasks/Microsoft.Common.CrossTargeting.targets
@@ -10,141 +10,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ImportByWildcardBeforeMicrosoftCommonCrossTargetingTargets Condition="'$(ImportByWildcardBeforeMicrosoftCommonCrossTargetingTargets)' == ''">true</ImportByWildcardBeforeMicrosoftCommonCrossTargetingTargets>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.CrossTargeting.targets\ImportBefore\*.targets"
-          Condition="'$(ImportByWildcardBeforeMicrosoftCommonCrossTargetingTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.CrossTargeting.targets\ImportBefore')"/>
-
-  <Import Project="$(CustomBeforeMicrosoftCommonCrossTargetingTargets)" Condition="'$(CustomBeforeMicrosoftCommonCrossTargetingTargets)' != '' and Exists('$(CustomBeforeMicrosoftCommonCrossTargetingTargets)')"/>
-
-  <!--
-  ============================================================
-                                       DispatchToInnerBuilds
-
-     Builds this project with /t:$(InnerTarget) /p:TargetFramework=X for each
-     value X in $(TargetFrameworks)
-
-     [IN]
-     $(TargetFrameworks) - Semicolon delimited list of target frameworks.
-     $(InnerTargets) - The targets to build for each target framework
-
-     [OUT]
-     @(InnerOutput) - The combined output items of the inner targets across
-                      all target frameworks..
-  ============================================================
-  -->
-  <Target Name="DispatchToInnerBuilds" Returns="@(InnerOutput)">
-    <ItemGroup>
-      <_TargetFramework Include="$(TargetFrameworks)" />
-    </ItemGroup>
-    <MSBuild Projects="$(MSBuildProjectFile)"
-             Condition="'$(TargetFrameworks)' != '' "
-             Targets="$(InnerTargets)"
-             Properties="TargetFramework=%(_TargetFramework.Identity)">
-      <Output ItemName="InnerOutput" TaskParameter="TargetOutputs" />
-    </MSBuild>
-  </Target>
-
-  <!--
-  ============================================================
-                                       Build
-
-   Cross-targeting version of Build.
-
-   [IN]
-   $(TargetFrameworks) - Semicolon delimited list of target frameworks.
-
-   $(InnerTargets)     - The targets to build for each target framework. Defaults
-                         to 'Build' if unset, but allows override to support
-                         `msbuild /p:InnerTargets=X;Y;Z` which will build X, Y,
-                         and Z targets for each target framework.
-
-   [OUT]
-   @(InnerOutput) - The combined output items of the inner targets across
-                    all builds.
-  ============================================================
-  -->
-  <Target Name="Build" DependsOnTargets="_SetBuildInnerTarget;DispatchToInnerBuilds" />
-
-  <Target Name="_SetBuildInnerTarget" Returns="@(InnerOutput)">
-    <PropertyGroup  Condition="'$(InnerTargets)' == ''">
-      <InnerTargets>Build</InnerTargets>
-    </PropertyGroup>
-  </Target>
-
-
-  <!--
-  ============================================================
-                                       Clean
-
-   Cross-targeting version of clean.
-  ============================================================
-  -->
-  <Target Name="Clean" DependsOnTargets="_SetCleanInnerTarget;DispatchToInnerBuilds" />
-  <Target Name="_SetCleanInnerTarget">
-    <PropertyGroup>
-      <InnerTargets>Clean</InnerTargets>
-    </PropertyGroup>
-  </Target>
-
-  <!--
-  ============================================================
-                                       Rebuild
-
-   Cross-targeting version of rebuild.
-  ============================================================
-  -->
-  <Target Name="Rebuild" DependsOnTargets="_SetRebuildInnerTarget;DispatchToInnerBuilds" />
-  <Target Name="_SetRebuildInnerTarget">
-    <PropertyGroup>
-      <InnerTargets>Rebuild</InnerTargets>
-    </PropertyGroup>
-  </Target>
-
-  <!--
-    This will import NuGet restore targets, which is a special case separate from the package -> project extension 
-    mechanism below. For obvious reasons,  we need restore to work before any package assets are available.
-
-    TODO: https://github.com/Microsoft/msbuild/issues/1061: This is now generalized with less coupling to nuget, 
-          but this codepath should remain as a compat shim until NuGet and the CLI use the CrossTargeting imports.
-  -->
-  <PropertyGroup>
-    <ImportByWildcardAfterMicrosoftCommonTargets Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == ''">true</ImportByWildcardAfterMicrosoftCommonTargets>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter\*.NuGet.*.targets"
-          Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter')"/>
-
-  <Import Project="$(CustomAfterMicrosoftCommonCrossTargetingTargets)" Condition="'$(CustomAfterMicrosoftCommonCrossTargetingTargets)' != '' and Exists('$(CustomAfterMicrosoftCommonCrossTargetingTargets)')"/>
-
-  <!--
-    Allow extensions like NuGet restore to work before any package assets are available.
-  -->
-  <PropertyGroup>
-    <ImportByWildcardAfterMicrosoftCommonCrossTargetingTargets Condition="'$(ImportByWildcardAfterMicrosoftCommonCrossTargetingTargets)' == ''">true</ImportByWildcardAfterMicrosoftCommonCrossTargetingTargets>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.CrossTargeting.targets\ImportAfter\*.targets" 
-          Condition="'$(ImportByWildcardAfterMicrosoftCommonCrossTargetingTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.CrossTargeting.targets\ImportAfter')"/>
-
-  <!--
-    Import project extensions which usually come from packages.  Package management systems will create a file at:
-      $(MSBuildProjectExtensionsPath)\$(MSBuildProjectFile).<SomethingUnique>.targets
-
-    Each package management system should use a unique moniker to avoid collisions.  It is a wild-card iport so the package
-    management system can write out multiple files but the order of the import is alphabetic because MSBuild sorts the list.
-
-    This is the same import that would happen in an inner (non-cross targeting) build. Package management systems are responsible for generating 
-    appropriate conditions based on $(IsCrossTargetingBuild) to pull in only those package targets that are meant to participate in a cross-targeting 
-    build.
-  -->
-  <PropertyGroup>
-    <ImportProjectExtensionTargets Condition="'$(ImportProjectExtensionTargets)' == ''">true</ImportProjectExtensionTargets>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" Condition="'$(ImportProjectExtensionTargets)' == 'true' and exists('$(MSBuildProjectExtensionsPath)')" />
-
-  <!-- TODO: https://github.com/Microsoft/msbuild/issues/1062: Remove this temporary hook when possible. -->
-  <Import Project="$(CoreCrossTargetingTargetsPath)" 
-          Condition="'$(CoreCrossTargetingTargetsPath)' != '' and Exists('$(CoreCrossTargetingTargetsPath)')" />
+<!-- These targets are deprecated, forward to new targets -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Microsoft.Common.MultiTargeting.targets" />
 </Project>
diff --git a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets b/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
index 49f35dade6e..50fa781b700 100644
--- a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
@@ -1503,7 +1503,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     passing $(TargetFrameworkMoniker) as $(ReferringTargetFramework) and sets the
     SetTargetFramework metadata of the project reference to the value that is returned.
 
-    This allows a cross-targeting project to select how it should be configured to
+    This allows a multi-targeting project to select how it should be configured to
     build against the most appropriate target for the referring target framework.
 
     ======================================================================================
@@ -1512,7 +1512,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
           Outputs="%(_MSBuildProjectReferenceExistent.Identity)">
     <!-- As a mitigation for https://github.com/Microsoft/msbuild/issues/1276
        .vcxproj is treated specially to avoid the cost of double-evaluating
-       for easily-identifiable-as-not-cross-targeting C++ projects. -->
+       for easily-identifiable-as-not-multi-targeting C++ projects. -->
     <MSBuild
         Projects="%(_MSBuildProjectReferenceExistent.Identity)"
         Targets="GetTargetFrameworkProperties"
@@ -1540,7 +1540,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     ============================================================
                                     GetTargetFrameworkProperties
 
-    Overrridden by cross-targeting projects to return the set of
+    Overrridden by multi-targeting projects to return the set of
     properties (in the form "key1=value1;...keyN=valueN") needed
     to build it with the best target for the referring project's
     target framework.
@@ -1562,7 +1562,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         [OUT]
         @(ProjectReferenceWithConfiguration)   - Project references with apporpriate metadata
         @(_MSBuildProjectReferenceExistent)    - Subset of @(ProjectReferenceWithConfiguration) that exist 
-                                                 with added SetTargetFramework metadata for cross-targeting
+                                                 with added SetTargetFramework metadata for multi-targeting
         @(_MSBuildProjectReferenceNonExistent) - Subset of  @(ProjectReferenceWithConfiguration) that do not exist
     ============================================================
   -->
diff --git a/src/XMakeTasks/Microsoft.Common.MultiTargeting.targets b/src/XMakeTasks/Microsoft.Common.MultiTargeting.targets
new file mode 100644
index 00000000000..0a87309e456
--- /dev/null
+++ b/src/XMakeTasks/Microsoft.Common.MultiTargeting.targets
@@ -0,0 +1,138 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ImportByWildcardBeforeMicrosoftCommonMultiTargetingTargets Condition="'$(ImportByWildcardBeforeMicrosoftCommonMultiTargetingTargets)' == ''">true</ImportByWildcardBeforeMicrosoftCommonMultiTargetingTargets>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.MultiTargeting.targets\ImportBefore\*.targets"
+          Condition="'$(ImportByWildcardBeforeMicrosoftCommonMultiTargetingTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.MultiTargeting.targets\ImportBefore')"/>
+
+  <Import Project="$(CustomBeforeMicrosoftCommonMultiTargetingTargets)" Condition="'$(CustomBeforeMicrosoftCommonMultiTargetingTargets)' != '' and Exists('$(CustomBeforeMicrosoftCommonMultiTargetingTargets)')"/>
+
+  <!--
+  ============================================================
+                                       DispatchToInnerBuilds
+
+     Builds this project with /t:$(InnerTarget) /p:TargetFramework=X for each
+     value X in $(TargetFrameworks)
+
+     [IN]
+     $(TargetFrameworks) - Semicolon delimited list of target frameworks.
+     $(InnerTargets) - The targets to build for each target framework
+
+     [OUT]
+     @(InnerOutput) - The combined output items of the inner targets across
+                      all target frameworks..
+  ============================================================
+  -->
+  <Target Name="DispatchToInnerBuilds" Returns="@(InnerOutput)">
+    <ItemGroup>
+      <_TargetFramework Include="$(TargetFrameworks)" />
+    </ItemGroup>
+    <MSBuild Projects="$(MSBuildProjectFile)"
+             Condition="'$(TargetFrameworks)' != '' "
+             Targets="$(InnerTargets)"
+             Properties="TargetFramework=%(_TargetFramework.Identity)">
+      <Output ItemName="InnerOutput" TaskParameter="TargetOutputs" />
+    </MSBuild>
+  </Target>
+
+  <!--
+  ============================================================
+                                       Build
+
+   Multi-targeting version of Build.
+
+   [IN]
+   $(TargetFrameworks) - Semicolon delimited list of target frameworks.
+
+   $(InnerTargets)     - The targets to build for each target framework. Defaults
+                         to 'Build' if unset, but allows override to support
+                         `msbuild /p:InnerTargets=X;Y;Z` which will build X, Y,
+                         and Z targets for each target framework.
+
+   [OUT]
+   @(InnerOutput) - The combined output items of the inner targets across
+                    all builds.
+  ============================================================
+  -->
+  <Target Name="Build" DependsOnTargets="_SetBuildInnerTarget;DispatchToInnerBuilds" />
+
+  <Target Name="_SetBuildInnerTarget" Returns="@(InnerOutput)">
+    <PropertyGroup  Condition="'$(InnerTargets)' == ''">
+      <InnerTargets>Build</InnerTargets>
+    </PropertyGroup>
+  </Target>
+
+
+  <!--
+  ============================================================
+                                       Clean
+
+   Multi-targeting version of clean.
+  ============================================================
+  -->
+  <Target Name="Clean" DependsOnTargets="_SetCleanInnerTarget;DispatchToInnerBuilds" />
+  <Target Name="_SetCleanInnerTarget">
+    <PropertyGroup>
+      <InnerTargets>Clean</InnerTargets>
+    </PropertyGroup>
+  </Target>
+
+  <!--
+  ============================================================
+                                       Rebuild
+
+   Multi-targeting version of rebuild.
+  ============================================================
+  -->
+  <Target Name="Rebuild" DependsOnTargets="_SetRebuildInnerTarget;DispatchToInnerBuilds" />
+  <Target Name="_SetRebuildInnerTarget">
+    <PropertyGroup>
+      <InnerTargets>Rebuild</InnerTargets>
+    </PropertyGroup>
+  </Target>
+
+  <!--
+    This will import NuGet restore targets, which is a special case separate from the package -> project extension 
+    mechanism below. For obvious reasons,  we need restore to work before any package assets are available.
+
+    TODO: https://github.com/Microsoft/msbuild/issues/1061: This is now generalized with less coupling to nuget, 
+          but this codepath should remain as a compat shim until NuGet and the CLI use the MultiTargeting imports.
+  -->
+  <PropertyGroup>
+    <ImportByWildcardAfterMicrosoftCommonTargets Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == ''">true</ImportByWildcardAfterMicrosoftCommonTargets>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter\*.NuGet.*.targets"
+          Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter')"/>
+
+  <Import Project="$(CustomAfterMicrosoftCommonMultiTargetingTargets)" Condition="'$(CustomAfterMicrosoftCommonMultiTargetingTargets)' != '' and Exists('$(CustomAfterMicrosoftCommonMultiTargetingTargets)')"/>
+
+  <!--
+    Allow extensions like NuGet restore to work before any package assets are available.
+  -->
+  <PropertyGroup>
+    <ImportByWildcardAfterMicrosoftCommonMultiTargetingTargets Condition="'$(ImportByWildcardAfterMicrosoftCommonMultiTargetingTargets)' == ''">true</ImportByWildcardAfterMicrosoftCommonMultiTargetingTargets>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.MultiTargeting.targets\ImportAfter\*.targets" 
+          Condition="'$(ImportByWildcardAfterMicrosoftCommonMultiTargetingTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.MultiTargeting.targets\ImportAfter')"/>
+
+  <!--
+    Import project extensions which usually come from packages.  Package management systems will create a file at:
+      $(MSBuildProjectExtensionsPath)\$(MSBuildProjectFile).<SomethingUnique>.targets
+
+    Each package management system should use a unique moniker to avoid collisions.  It is a wild-card iport so the package
+    management system can write out multiple files but the order of the import is alphabetic because MSBuild sorts the list.
+
+    This is the same import that would happen in an inner (non-multi targeting) build. Package management systems are responsible for generating 
+    appropriate conditions based on $(IsMultiTargetingBuild) to pull in only those package targets that are meant to participate in a multi-targeting 
+    build.
+  -->
+  <PropertyGroup>
+    <ImportProjectExtensionTargets Condition="'$(ImportProjectExtensionTargets)' == ''">true</ImportProjectExtensionTargets>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" Condition="'$(ImportProjectExtensionTargets)' == 'true' and exists('$(MSBuildProjectExtensionsPath)')" />
+
+  <!-- TODO: https://github.com/Microsoft/msbuild/issues/1062: Remove this temporary hook when possible. -->
+  <Import Project="$(CoreMultiTargetingTargetsPath)" 
+          Condition="'$(CoreMultiTargetingTargetsPath)' != '' and Exists('$(CoreMultiTargetingTargetsPath)')" />
+</Project>
diff --git a/src/XMakeTasks/Microsoft.VisualBasic.CrossTargeting.targets b/src/XMakeTasks/Microsoft.VisualBasic.CrossTargeting.targets
index e0c0b18d373..d9b7b78a142 100644
--- a/src/XMakeTasks/Microsoft.VisualBasic.CrossTargeting.targets
+++ b/src/XMakeTasks/Microsoft.VisualBasic.CrossTargeting.targets
@@ -10,15 +10,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 
+<!-- These targets are deprecated, forward to new targets -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed. -->
-  <!-- Import design time targets before the common crosstargeting targets, which import targets from Nuget. -->
-  <PropertyGroup>
-     <VisualBasicDesignTimeTargetsPath Condition="'$(VisualBasicDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.VisualBasic.DesignTime.targets</VisualBasicDesignTimeTargetsPath>
-  </PropertyGroup>
-  <Import Project="$(VisualBasicDesignTimeTargetsPath)" Condition="'$(VisualBasicDesignTimeTargetsPath)' != '' and Exists('$(VisualBasicDesignTimeTargetsPath)')" />
-
-  <Import Project="Microsoft.Common.CrossTargeting.targets" />
-
-</Project>
+  <Import Project="Microsoft.VisualBasic.MultiTargeting.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/XMakeTasks/Microsoft.VisualBasic.MultiTargeting.targets b/src/XMakeTasks/Microsoft.VisualBasic.MultiTargeting.targets
new file mode 100644
index 00000000000..c067f35fd41
--- /dev/null
+++ b/src/XMakeTasks/Microsoft.VisualBasic.MultiTargeting.targets
@@ -0,0 +1,24 @@
+<!--
+***********************************************************************************************
+Microsoft.VisualBasic.MultiTargeting.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (C) Microsoft Corporation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Import design time targets for Roslyn Project System. These are only available if Visual Studio is installed. -->
+  <!-- Import design time targets before the common multitargeting targets, which import targets from Nuget. -->
+  <PropertyGroup>
+     <VisualBasicDesignTimeTargetsPath Condition="'$(VisualBasicDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.VisualBasic.DesignTime.targets</VisualBasicDesignTimeTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(VisualBasicDesignTimeTargetsPath)" Condition="'$(VisualBasicDesignTimeTargetsPath)' != '' and Exists('$(VisualBasicDesignTimeTargetsPath)')" />
+
+  <Import Project="Microsoft.Common.MultiTargeting.targets" />
+
+</Project>
diff --git a/src/XMakeTasks/Microsoft.VisualBasic.targets b/src/XMakeTasks/Microsoft.VisualBasic.targets
index c4992291b09..c323354112f 100644
--- a/src/XMakeTasks/Microsoft.VisualBasic.targets
+++ b/src/XMakeTasks/Microsoft.VisualBasic.targets
@@ -18,11 +18,13 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- 
-       We are doing a cross-targeting build if there is no list of target frameworks specified
+       We are doing a multi-targeting build if there is no list of target frameworks specified
        nor is there a current target framework being built individually. In that case, this import is
-       redirected to Microsoft.VisualBasic.CrossTargeting.targets.
+       redirected to Microsoft.VisualBasic.MultiTargeting.targets.
    -->
    <PropertyGroup Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">
+      <IsMultiTargetingBuild>true</IsMultiTargetingBuild>
+      <!-- back-compat for deprecated IsCrossTargetingBuild property -->
       <IsCrossTargetingBuild>true</IsCrossTargetingBuild>
    </PropertyGroup>
 
@@ -50,9 +52,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <VbcToolPath Condition="'$(VbcToolPath)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">$(MsBuildFrameworkToolsPath)</VbcToolPath>
       </PropertyGroup>
     </When>
-    <When Condition="'$(IsCrossTargetingBuild)' == 'true'">
+    <When Condition="'$(IsMultiTargetingBuild)' == 'true'">
       <PropertyGroup>
-        <VisualBasicTargetsPath>$(MSBuildToolsPath)\Microsoft.VisualBasic.CrossTargeting.targets</VisualBasicTargetsPath>
+        <VisualBasicTargetsPath>$(MSBuildToolsPath)\Microsoft.VisualBasic.MultiTargeting.targets</VisualBasicTargetsPath>
       </PropertyGroup>
     </When>
     <Otherwise>