Merge pull request #3155 from wli3/muti-target-5.0-second-part

Muti target 5.0 second part

eng/WpfArcadeSdk/tools/Pbt.props

 <Project>
   <PropertyGroup>
-    <LocalMicrosoftWinFXProps>$(RepoRoot)src\Microsoft.DotNet.Wpf\src\PresentationBuildTasks\Microsoft.WinFX.props</LocalMicrosoftWinFXProps>
     <LocalMicrosoftWinFXTargets>$(RepoRoot)src\Microsoft.DotNet.Wpf\src\PresentationBuildTasks\Microsoft.WinFX.targets</LocalMicrosoftWinFXTargets>
   </PropertyGroup>
 
@@ -35,8 +34,6 @@
             Project="../targets/Microsoft.NET.Sdk.WindowsDesktop.props"
             Condition="!Exists('$(LocalMicrosoftWinFXTargets)') And '$(InternalMarkupCompilation)'=='true'"/>
 
-    We need Microsoft.WinFX.props though, so that's imported here specifically.
-
     The use of Microsoft.NET.Sdk.WindowsDesktop doesn't break the source-build promise.
       - Microsoft.NET.Sdk.WindowsDesktop is built from sources
       - It is used for compilation of assemblies in dotnet-wpf-int (the internal WPF repo), and serves as a
@@ -46,18 +43,4 @@
         as a convenient 'transport package').
   -->
 
-  <!--
-    If local PresentationBuildTasks project is present, then import WinFX.props from local sources;
-    otherwise import Microsoft.NET.Sdk.WindowsDesktop.props from Microsoft.NET.Sdk.WindowsDesktop
-
-    We can not really test for $(InternalMarkupCompilation)==true here. It is usually defined
-    in the csproj - which is included after props (but before targets).
-  -->
-  <Import Project="$(WpfSourceDir)PresentationBuildTasks\Microsoft.WinFX.props"
-          Condition="Exists('$(LocalMicrosoftWinFXProps)') "/>
-
-  <Import Sdk="Microsoft.NET.Sdk.WindowsDesktop"
-        Project="../targets/Microsoft.WinFX.props"
-        Condition="!Exists('$(LocalMicrosoftWinFXProps)') And
-                    Exists('../targets/Microsoft.WinFX.props')"/>
 </Project>

packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props

@@ -17,13 +17,11 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
-  <!-- The MicrosoftWindowsDesktopSdkPath is a hook so that you can redirect to a local version of the WPF SDK targets
-       (ie in order to test changes locally) without modifying the .NET Core SDK itself.  This should work
-       as long as there are no changes to Sdk.props and Sdk.targets themselves. -->
-  <PropertyGroup Condition="'$(MicrosoftWindowsDesktopSdkPath)' == ''">
-    <MicrosoftWindowsDesktopSdkPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\targets))</MicrosoftWindowsDesktopSdkPath>
+  <!-- Set ImportWindowsDesktopTargets to force import WindowsDesktop Targets to enable pre 5.0 behavior.
+      Post 5.0, Microsoft.NET.Sdk.WindowsDesktop.props will always be imported by SDK
+  -->
+  <PropertyGroup>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
 
-  <Import Project="$(MicrosoftWindowsDesktopSdkPath)\Microsoft.NET.Sdk.WindowsDesktop.props "/>
-
 </Project>

packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets

@@ -12,7 +12,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-  
-  <Import Project="$(MicrosoftWindowsDesktopSdkPath)\Microsoft.NET.Sdk.WindowsDesktop.targets "/>
 
+  <!--Post 5.0, Microsoft.NET.Sdk.WindowsDesktop.targets will be imported by SDK conditionally-->
 </Project>

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.props

-<Project>
-
-</Project>

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj

@@ -44,7 +44,6 @@
     content\targets\
   -->
   <ItemGroup>
-    <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.props" SubFolder="root\targets" />
     <PackagingContent Include="$(MSBuildThisFileDirectory)Microsoft.WinFX.targets" SubFolder="root\targets" />
   </ItemGroup>