From 90d573289556315f9b9cd1ae16e34e6a336fce9f Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 24 Jun 2019 13:59:46 -0700
Subject: [PATCH 1/2] Define _WindowsDesktopSdkTargetFrameworkVersionFloor
 before  Microsoft.NET.Sdk.WindowsDesktop.targets is imported

---
 eng/WpfArcadeSdk/tools/Pbt.targets | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/Pbt.targets b/eng/WpfArcadeSdk/tools/Pbt.targets
index a0f7d16292f..8d1ca041a32 100644
--- a/eng/WpfArcadeSdk/tools/Pbt.targets
+++ b/eng/WpfArcadeSdk/tools/Pbt.targets
@@ -90,7 +90,14 @@
   -->
   <Import Project="$(WpfSourceDir)PresentationBuildTasks\Microsoft.WinFX.targets" 
           Condition="'$(InternalMarkupCompilation)'=='true' And Exists('$(LocalMicrosoftWinFXTargets)') "/>
-  
+
+  <!-- 
+    _WindowsDesktopSdkTargetFrameworkVersionFloor is defined in Microsoft.NET.WindowDesktop.props. 
+    This needs to be defined before Microsoft.NET.Sdk.WindowsDesktop.targets is imported. 
+  -->
+  <PropertyGroup Condition="'$(InternalMarkupCompilation)'=='true' And !Exists('$(LocalMicrosoftWinFXTargets)') ">
+    <_WindowsDesktopSdkTargetFrameworkVersionFloor Condition="'$(_WindowsDesktopSdkTargetFrameworkVersionFloor)' == ''">3.0</_WindowsDesktopSdkTargetFrameworkVersionFloor>
+  </PropertyGroup>
   <Import Sdk="Microsoft.NET.Sdk.WindowsDesktop"
           Project="../targets/Microsoft.NET.Sdk.WindowsDesktop.targets"
           Condition="'$(InternalMarkupCompilation)'=='true' And !Exists('$(LocalMicrosoftWinFXTargets)') "/>

From f0c42778602875eed1ffa02aa9c9a6b505ff21cb Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 24 Jun 2019 14:02:28 -0700
Subject: [PATCH 2/2] Suppress NETSDK1106

---
 eng/WpfArcadeSdk/tools/Pbt.props | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eng/WpfArcadeSdk/tools/Pbt.props b/eng/WpfArcadeSdk/tools/Pbt.props
index 32e387421df..4d6e6f5eaae 100644
--- a/eng/WpfArcadeSdk/tools/Pbt.props
+++ b/eng/WpfArcadeSdk/tools/Pbt.props
@@ -12,6 +12,14 @@
     <PbtDir>$(ArtifactsTmpDir)PresentationBuildTasks\$(PbtTfm)\</PbtDir>
   </PropertyGroup>
 
+  <!-- 
+    Local markup compilation uses $(InternalMarkupCompilation) instead of $(UseWpf). Suppress the 
+    corresponding SDK warning. 
+  -->
+  <PropertyGroup>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1106</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
   <!-- 
     We will use Microsoft.NET.Sdk.WindowsDesktop targets directly when local PresentationBuildTasks is not available
     We do not need to import Microsoft.NET.Sdk.WindowsDesktop.props from the Sdk - this only provides us with