From 1f8f9388de7eb51e5c01351aa143bbf3e0b31b0b Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 18 Apr 2019 11:20:38 -0700
Subject: [PATCH 1/3] Setting TargetingPackVersion explicitly. Excluding Test
 projects from RuntimeFrameworkVersion.

---
 .../tools/RuntimeFrameworkReference.props            |  2 +-
 .../tools/RuntimeFrameworkReference.targets          | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
index 8f7eb9ccecb..43eb0affa6a 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true'">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) ">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index f21b197d136..065527bdd93 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -6,14 +6,20 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Platforms" 
                       Version="$(MicrosoftNETCorePlatformsVersion)" 
-                      Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(IsTestProject)'!='true'"/>
+                      Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'"/>
+    
     <AdditionalPackageReference Include="Microsoft.NETCore.Platforms" 
                                 Version="$(MicrosoftNETCorePlatformsVersion)" 
-                                Condition="'$(ManagedCxx)'=='true'"/>
+                                Condition="'$(ManagedCxx)'=='true' And '$(WpfTest)'!='true'"/>
+    
+    <FrameworkReference Update="Microsoft.NETCore.App"
+                      Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true' And $(TargetFramework.StartsWith('netcoreapp3.')) And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'">
+      <TargetingPackVersion>$(MicrosoftNETCoreAppVersion)</TargetingPackVersion>
+    </FrameworkReference>
   </ItemGroup>
 
   <PropertyGroup>
     <!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
-    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
+    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.')) And '$(WpfTest)'=='true'" />
   </PropertyGroup>
 </Project>

From c28e399e4a5c3c1186bd7b02ef6211c4cb5476ca Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 18 Apr 2019 11:20:54 -0700
Subject: [PATCH 2/3] Move M.NETCore.App from product -> toolset dependency

---
 eng/Version.Details.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e7fec4dcb5b..f3993142d08 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27617-01">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>3abca437fee294811fca2f81e9e5118a5b4c45fe</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview5.19208.4">
       <Uri>https://github.com/dotnet/winforms</Uri>
       <Sha>fd52f87e309d708ce4491f7c65b892f29091346f</Sha>
@@ -63,6 +59,10 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27617-01">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>3abca437fee294811fca2f81e9e5118a5b4c45fe</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19217.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>4e21d52dabbb9f5705a90f097acb1465a0354c0d</Sha>

From 2688e09d7e18d497c03d934ccc72017e23f07c5c Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Thu, 18 Apr 2019 13:23:06 -0700
Subject: [PATCH 3/3] Moving all corefx (and coreclr) dependencies to
 ToolsetDependencies (per mmitche)

---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1aa9eb4186e..bb7a6536337 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,6 +5,8 @@
       <Uri>https://github.com/dotnet/winforms</Uri>
       <Sha>f977a22b418447e1a42d04a61ab29c289465146f</Sha>
     </Dependency>
+  </ProductDependencies>
+  <ToolsetDependencies>
     <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19218.1" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
@@ -57,8 +59,6 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>82eedbff6b767c0bd9297d3dd27c89d925a28e93</Sha>
     </Dependency>
-  </ProductDependencies>
-  <ToolsetDependencies>
     <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27618-06">
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>4d6087136f8af1c076f706f59441f6de9795980b</Sha>