From 922982f29a0ce987888534df8afa9b8b024b9e28 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 15 Apr 2019 14:47:12 -0700
Subject: [PATCH 1/3] References will be delivered in .NET Core 3 through
 ref-packs instead of using PackageReference.

This change adapts to that expectation.

If we are still using an older version of tools.dotnet in global.json, we will go through `ResolveMicrosoftNetCoreAppReferences` . OTOH, when global.json gets updated to a newer version of tools.dotnet, `LimitNetCoreAppReferences` will kick-in and do the right thing.

Adjust System.Xaml.csproj a bit to ensure that it has the right references. No other changes were necessary to projects in dotnet-wpf-int.

Similar paths exist for `Microsoft.WindowsDesktop.App[.Ref]` - this is reserved for future use.
---
 eng/WpfArcadeSdk/tools/SdkReferences.targets  | 173 ++++++++++++------
 .../src/System.Xaml/System.Xaml.csproj        |  23 ++-
 2 files changed, 127 insertions(+), 69 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets
index 6544fe441ce..0481c0d8990 100644
--- a/eng/WpfArcadeSdk/tools/SdkReferences.targets
+++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets
@@ -5,97 +5,150 @@
                       ExcludeAssets="All"
                       GeneratePathProperty="True"
                       Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And $(TargetFramework.StartsWith('netcoreapp3')) And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/>
+
+    <!--
+      When @(NetCoreReference) is non-empty, exclude all assets (ExcludeAssets = All) and re-add them in 
+      ResolveMicrosoftNetCoreAppReferences target
+    -->
+    <PackageReference Update="Microsoft.NETCore.App"
+                      GeneratePathProperty="true"
+                      ExcludeAssets="All"
+                      Condition="'@(NetCoreReference)'!='' And '$(DoNotLimitMicrosoftNetCoreReferences)'!='true' And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(DisableImplicitFrameworkReferences)' != 'true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
+
+    <PackageReference Update="Microsoft.NETCore.App"
+                    GeneratePathProperty="true"
+                    Condition="('@(NetCoreReference)'=='' Or '$(DoNotLimitMicrosoftNetCoreReferences)' == 'true') And '$(MSBuildProjectExtension)'!='.vcxproj' And '$(DisableImplicitFrameworkReferences)' != 'true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
   </ItemGroup>
-  
+
+  <Target Name="GeneratePathPropertyforMicrosoftWindowsDesktopApp"
+          AfterTargets="ResolveFrameworkReferences">
+    <ItemGroup>
+      <PackageReference Update="Microsoft.WindowsDesktop.App"
+                        GeneratePathProperty="true" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <ResolveAssemblyReferencesDependsOn>
+      ResolveMicrosoftNetCoreAppReferences;
+      ResolveMicrosoftWindowsDesktopAppReferences;
+      ResolveMicrosoftDotNetWpfGitHubReferences;
+      ResolveWinFormsReferences;
+      $(ResolveAssemblyReferencesDependsOn)
+    </ResolveAssemblyReferencesDependsOn>
+  </PropertyGroup>
+
+  <Target
+    Name="ResolveMicrosoftNetCoreAppReferences"
+    Returns="@(Reference)"
+    Condition="'$(PkgMicrosoft_NETCore_App)'!='' And '@(NetCoreReference)'!='' and $(TargetFramework.StartsWith('netcoreapp3')) and '$(DoNotLimitMicrosoftNetCoreReferences)'!='true'">
+    <!-- 
+    In your project, Add a references to assemblies from Microsoft.NETCore.App like this
+      <ItemGroup>
+        <NetCoreReference Include="netstandard" />
+        <NetCoreReference Include="System.IO" />
+      </ItemGroup>
+      
+      It will get translated into something like this:
+      <ItemGroup>
+        <Reference Include="C:\Users\username\.nuget\packages\microsoft.netcore.app\3.0.0-preview5-27609-17\ref\netcoreapp3.0\netstandard.dll" />
+        <Reference Include="C:\Users\username\.nuget\packages\microsoft.netcore.app\3.0.0-preview5-27609-17\ref\netcoreapp3.0\System.IO.dll" />
+      </ItemGroup>
+    -->
+    <ItemGroup>
+      <Reference Include="$(PkgMicrosoft_NETCore_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll"
+                 Condition="Exists('$(PkgMicrosoft_NETCore_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll')" />
+    </ItemGroup>
+  </Target>
+
+
   <Target
     Name="LimitNetCoreAppReferences"
     AfterTargets="ResolveAssemblyReferences"
     Returns="@(ReferencePath)"
-    Condition="'@(NetCoreReference)'!='' and '@(ReferencePath)' != ''">
-
-
-    <!-- 
+    Condition="'$(PkgMicrosoft_NETCore_App)'=='' And '@(NetCoreReference)'!='' and '@(ReferencePath)' != ''">
+    <!--
       Example
-      <NetCoreReference Include="Microsoft.CSharp" /> 
+      <NetCoreReference Include="Microsoft.CSharp" />
     -->
 
-    <!-- Save Microsoft.NETCore.App assemblies, and remove those from @(ReferencePath) -->
+    <!--
+       Save Microsoft.NETCore.App.Ref assemblies, and remove those from @(ReferencePath)
+     -->
     <ItemGroup>
       <_netCoreAppSdkReference Remove="@(_netCoreAppSdkReference)" />
-      <_netCoreAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App'"/>
-      
+      <_netCoreAppSdkReference Include="@(ReferencePath)"
+                               Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App.Ref'" />
+
       <ReferencePath Remove="@(_netCoreAppSdkReference)" />
     </ItemGroup>
-    
-    <!-- Transform _netCoreAppSdkReference's Identity to its FileName. This will help us do a Remove against @(NetCoreReference) directly -->
+
     <ItemGroup>
-      <_netCoreAppSdkUnwantedRefNormalized Remove="@(_netCoreAppSdkUnwantedRefNormalized)" />
-      <_netCoreAppSdkUnwantedRefNormalized Include="@(_netCoreAppSdkReference->'%(FileName)')" />
-      <_netCoreAppSdkUnwantedRefNormalized Remove="@(NetCoreReference)"  />
+      <_netCoreAppReferences Remove="@(_netCoreAppReferences)" />
     </ItemGroup>
+    <FilterItem1ByItem2 Item1="@(_netCoreAppSdkReference->'%(FileName)')"
+                        Item2="@(NetCoreReference)"
+                        Metadata2="Identity"
+                        PreserveItem1Metadata="true">
+      <Output ItemName="_netCoreAppReferences" TaskParameter="Result" />
+    </FilterItem1ByItem2>
 
-    <!-- Convert the Identity metadata of _netCoreAppSdkUnwantedRefNormalized back to it's Original value -->
     <ItemGroup>
-      <_netCoreAppSdkUnwantedRef Remove="@(_netCoreAppSdkUnwantedRef)" />
-      <_netCoreAppSdkUnwantedRef Include="@(_netCoreAppSdkUnwantedRefNormalized->'%(OriginalItemSpec)')" />
+      <ReferencePath Include="@(_netCoreAppReferences->'%(OriginalItemSpec)')" />
     </ItemGroup>
-    
-    <!-- Reconstruct ReferencePath, but this time exclude the unwanted references out -->
+  </Target>
+
+  <Target Name="ResolveMicrosoftWindowsDesktopAppReferences"
+          Returns="@(Reference)"
+          Condition="'$(PkgMicrosoft_WindowsDesktop_App)'!='' And '@(WindowsDesktopAppeference)'!='' and $(TargetFramework.StartsWith('netcoreapp3')) and '$(DoNotLimitWindowsDesktopAppReferences)'!='true'">
+    <!-- 
+    In your project, Add a references to assemblies from Microsoft.NETCore.App like this
+      <ItemGroup>
+        <WindowsDesktopAppeference Include="PresentationCore" />
+        <WindowsDesktopAppeference Include="System.Xaml" />
+      </ItemGroup>
+    -->
     <ItemGroup>
-      <ReferencePath 
-        Include="@(_netCoreAppSdkReference)" 
-        Exclude="@(_netCoreAppSdkUnwantedRef)"/>
+      <Reference Include="$(PkgMicrosoft_WindowsDesktop_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll"
+                 Condition="Exists('$(PkgMicrosoft_WindowsDesktop_App)\ref\$(TargetFramework)\%(NetCoreReference.Identity).dll')" />
     </ItemGroup>
   </Target>
-  
-  <Target
-    Name="LimitWindowsDekstopAppReferences"
-    AfterTargets="ResolveAssemblyReferences"
-    Returns="@(ReferencePath)"
-    Condition="'@(WindowsDesktopReference)'!='' and '@(ReferencePath)' != ''">
-    <!-- 
+
+  <Target Name="LimitWindowsDesktopAppReferences"
+        AfterTargets="ResolveAssemblyReferences"
+        Returns="@(ReferencePath)"
+        Condition="'$(PkgMicrosoft_WindowsDesktop_App)'=='' And '@(WindowsDesktopReference)'!='' and '@(ReferencePath)' != ''">
+    <!--
       Example
-      <WindowsDesktopReference Include="PresentationCore" /> 
+      <WindowsDesktopReference Include="PresentationCore" />
     -->
 
-    <!-- Save Microsoft.WindowsDesktop.App assemblies, and remove those from @(ReferencePath) -->
+    <!--
+       Save Microsoft.WindowsDesktop.App.Ref assemblies, and remove those from @(ReferencePath)
+     -->
     <ItemGroup>
       <_windowsDesktopAppSdkReference Remove="@(_windowsDesktopAppSdkReference)" />
-      <_windowsDesktopAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.WindowsDesktop.App'"/>
+      <_windowsDesktopAppSdkReference Include="@(ReferencePath)"
+                                      Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.WindowsDesktop.App.Ref'" />
 
       <ReferencePath Remove="@(_windowsDesktopAppSdkReference)" />
     </ItemGroup>
 
-    <!-- Transform _windowsDesktopAppSdkReference's Identity to its FileName. This will help us do a Remove against @(NetCoreReference) directly -->
     <ItemGroup>
-      <_windowsDesktopAppSdkUnwantedRefNormalized Remove="@(_windowsDesktopAppSdkUnwantedRefNormalized)" />
-      <_windowsDesktopAppSdkUnwantedRefNormalized Include="@(_windowsDesktopAppSdkReference->'%(FileName)')" />
-      <_windowsDesktopAppSdkUnwantedRefNormalized Remove="@(WindowsDesktopReference)"  />
+      <_windowsDesktopAppReferences Remove="@(_windowsDesktopAppReferences)" />
     </ItemGroup>
+    <FilterItem1ByItem2 Item1="@(_windowsDesktopAppSdkReference->'%(FileName)')"
+                        Item2="@(WindowsDesktopReference)"
+                        Metadata2="Identity"
+                        PreserveItem1Metadata="true">
+      <Output ItemName="_windowsDesktopAppReferences" TaskParameter="Result" />
+    </FilterItem1ByItem2>
 
-    <!-- Convert the Identity metadata of _windowsDesktopAppSdkUnwantedRefNormalized back to it's Original value -->
     <ItemGroup>
-      <_windowsDesktopAppSdkUnwantedRef Remove="@(_windowsDesktopAppSdkUnwantedRef)" />
-      <_windowsDesktopAppSdkUnwantedRef Include="@(_windowsDesktopAppSdkUnwantedRefNormalized->'%(OriginalItemSpec)')" />
-    </ItemGroup>
-
-    <!-- Reconstruct ReferencePath, but this time exclude the unwanted references out -->
-    <ItemGroup>
-      <ReferencePath
-        Include="@(_windowsDesktopAppSdkReference)"
-        Exclude="@(_windowsDesktopAppSdkUnwantedRef)"/>
+      <ReferencePath Include="@(_windowsDesktopAppReferences->'%(OriginalItemSpec)')" />
     </ItemGroup>
   </Target>
 
-  
-  <PropertyGroup>
-    <ResolveAssemblyReferencesDependsOn>
-      ResolveMicrosoftDotNetWpfGitHubReferences;
-      ResolveWinFormsReferences;
-      $(ResolveAssemblyReferencesDependsOn)
-    </ResolveAssemblyReferencesDependsOn>
-  </PropertyGroup>
-  
   <Target
     Name="ResolveMicrosoftDotNetWpfGitHubReferences"
     Returns="@(ReferencePath)"
@@ -106,13 +159,13 @@
         <MicrosoftDotNetWpfGitHubReference Include="System.Xaml" />
       </ItemGroup>
       
-    It will get translated into something like this:
+      It will get translated into something like this:
       <ItemGroup>
         <Reference Include="C:\Users\username\.nuget\packages\microsoft.dotnet.wpf.github\4.8.0-preview4.19174.2\ref\netcoreapp3.0\System.Xaml.dll" />
       </ItemGroup>
-  -->
+    -->
     <ItemGroup>
-      <Reference Include="$(PkgMicrosoft_DotNet_Wpf_GitHub)\ref\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll" 
+      <Reference Include="$(PkgMicrosoft_DotNet_Wpf_GitHub)\ref\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll"
                  Condition="Exists('$(PkgMicrosoft_DotNet_Wpf_GitHub)\ref\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll')"/>
     </ItemGroup>
   </Target>
@@ -128,11 +181,11 @@
       <ItemGroup>
         <Reference Include="C:\Users\username\.nuget\packages\microsoft.private.winforms\4.8.0-preview4.19170.4\lib\netcoreapp3.0\Accessibility.dll" />
       </ItemGroup>
-  -->
+   -->
   <Target Name="ResolveWinFormsReferences"
           Condition="'@(MicrosoftPrivateWinFormsReference)'!='' And $(TargetFramework.StartsWith('netcoreapp3'))">
     <ItemGroup>
-      <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll" 
+      <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll"
                  Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')"/>
     </ItemGroup>
   </Target>
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
index 005d499df11..5e58bd4ebb1 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
@@ -51,13 +51,13 @@
       <Link>Common\WPF\MS\Utility\FrugalList.cs</Link>
     </Compile>
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Include="$(WpfCommonDir)src\System\SR.cs">
-        <Link>Common\System\SR.cs</Link>
+      <Link>Common\System\SR.cs</Link>
     </Compile>
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Remove="System\Xaml\XamlProperty.cs" />
     <Compile Remove="System\Windows\Markup\ValueSerializerAttribute.cs" />
@@ -83,32 +83,37 @@
     <Compile Remove="System\Xaml\Context\HashSet.cs" />
     <Compile Remove="System\Xaml\MS\Impl\ConcurrentDictionary.cs" />
     <Compile Remove="System\Xaml\MS\Impl\XamlPropertyInfoKey.cs" />
-    
-   </ItemGroup>
-    
+
+  </ItemGroup>
+
   <ItemGroup>
     <NetCoreReference Include="netstandard" />
     <NetCoreReference Include="System" />
     <NetCoreReference Include="System.Collections" />
     <NetCoreReference Include="System.Collections.Concurrent" />
     <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.Collections.Specialized" />    
+    <NetCoreReference Include="System.Collections.Specialized" />
     <NetCoreReference Include="System.ComponentModel" />
     <NetCoreReference Include="System.ComponentModel.Primitives" />
     <NetCoreReference Include="System.ComponentModel.TypeConverter" />
     <NetCoreReference Include="System.Diagnostics.Debug" />
     <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Globalization" />
+    <NetCoreReference Include="System.IO" />
     <NetCoreReference Include="System.ObjectModel" />
     <NetCoreReference Include="System.Reflection.Emit.ILGeneration" />
     <NetCoreReference Include="System.Reflection.Emit.Lightweight" />
-    <NetCoreReference Include="System.Reflection.Primitives" />    
+    <NetCoreReference Include="System.Reflection.Primitives" />
     <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />    
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Reflection" />
     <NetCoreReference Include="System.Runtime.Extensions" />
     <NetCoreReference Include="System.Runtime.InteropServices" />
     <NetCoreReference Include="System.Runtime.Serialization.Formatters" />
+    <NetCoreReference Include="System.Text.Encoding" />
     <NetCoreReference Include="System.Text.Encoding.Extensions" />
     <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Tasks" />
     <NetCoreReference Include="System.Threading.Thread" />
     <NetCoreReference Include="System.Threading.ThreadPool" />
     <NetCoreReference Include="System.Xml" />

From 510ead58e98fa3a5787c1c709c6868197af5f87f Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 15 Apr 2019 15:36:33 -0700
Subject: [PATCH 2/3] Update global.json tools.dotnet and sdk.version to be
 identical to the version in use today in release/3.0 branch.

Remove redundant PackageReference from RuntimeFrameworkReference.props.

opt-out tests from RuntimeFrameworkReference for now.
---
 .../tools/RuntimeFrameworkReference.props      |  8 --------
 .../tools/RuntimeFrameworkReference.targets    | 18 +++++++++++++++---
 global.json                                    |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
index dff7f276903..8f7eb9ccecb 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props
@@ -3,14 +3,6 @@
     <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And '$(NoTargets)'!='true'">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 
-  <!-- 
-    Explicitly import Microsoft.NETCore.Platforms to prevent using the one from the SDK, which
-    usually lags behind the version that WPF gets from CoreFx packages 
-  -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
-  </ItemGroup>
-
   <!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
   <PropertyGroup>
     <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index c9c4d59b569..a04e0e9783a 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -4,12 +4,24 @@
     usually lags behind the version that WPF gets from CoreFx packages 
   -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
-    <AdditionalPackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(ManagedCxx)'=='true'"/>
+    <PackageReference Include="Microsoft.NETCore.Platforms" 
+                      Version="$(MicrosoftNETCorePlatformsVersion)" 
+                      Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(IsTestProject)'!='true'"/>
+    <AdditionalPackageReference Include="Microsoft.NETCore.Platforms" 
+                                Version="$(MicrosoftNETCorePlatformsVersion)" 
+                                Condition="'$(ManagedCxx)'=='true'"/>
   </ItemGroup>
 
   <PropertyGroup>
     <!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
-    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
+    <!-- 
+      Right now, we are building some test projects with Microsoft.NET.Sdk.WindowsDesktop, 
+      which is not idea. We should be using InternalMarkupCompilation=true and directly referencing
+      WPF product-assembly projects. 
+      These 'WindowsDesktop' based projects seem to have a conflict with RuntimeFrameworkVersion at
+      this time. Until the work for 'testhost' is completed (https://github.com/dotnet/wpf/issues/304), 
+      we will not enable RuntimeFrameworkVersion for test projects. 
+    -->
+    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.')) Or '$(IsTestProject)'=='true'" />
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
index ee36759005f..7f1153fd59a 100644
--- a/global.json
+++ b/global.json
@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview-010024",
+    "dotnet": "3.0.100-preview4-011144",
     "vs": {
       "version": "16.0"
     }
   },
   "sdk": {
-    "version": "3.0.100-preview-010024"
+    "version": "3.0.100-preview4-011144"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19214.2"

From 303c793a040f43339d19ba04f448e6267d724045 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Mon, 15 Apr 2019 18:35:50 -0700
Subject: [PATCH 3/3] Revert back to original global.json. We need a coherent
 build version to update the value of tools.dotnet and sdk.version. This is so
 because of the following chain of events:

i. dotnet.tools downloads version A of core-sdk with version A' of Microsoft.NetCore.App
ii. core-sdk version A contains Microsoft.WindowsDesktop.App, which contains windowsdesktop.app.runtimeconfig.json, which has a reference to Microsoft.NetCore.App version B. (A 'coherent build' would have pointed to Microsoft.NetCore.App version A', same as the one noted in (i), instead)
iii. When running tests involving Sdk.WindowsDesktop, they start off using core-sdk version A/Microsoft.NetCore.App version A', and then look for Microsoft.NetCore.App version B (because WindowsDesktop.App.RuntimeConfig.json refers to it), and fails.

Ideally, we should not be using Sdk.WindowsDesktop at all. Instead, we should be using InternalMarkupCompilation + ProjectReferences. For now, moving back to an older versin of tools.dotnet. We can update it to a newer (preview4) version later.
---
 .../tools/RuntimeFrameworkReference.targets   | 10 +------
 global.json                                   | 30 +++++++++----------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index a04e0e9783a..f21b197d136 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -14,14 +14,6 @@
 
   <PropertyGroup>
     <!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
-    <!-- 
-      Right now, we are building some test projects with Microsoft.NET.Sdk.WindowsDesktop, 
-      which is not idea. We should be using InternalMarkupCompilation=true and directly referencing
-      WPF product-assembly projects. 
-      These 'WindowsDesktop' based projects seem to have a conflict with RuntimeFrameworkVersion at
-      this time. Until the work for 'testhost' is completed (https://github.com/dotnet/wpf/issues/304), 
-      we will not enable RuntimeFrameworkVersion for test projects. 
-    -->
-    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.')) Or '$(IsTestProject)'=='true'" />
+    <RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
index 7f1153fd59a..5beb532cc2f 100644
--- a/global.json
+++ b/global.json
@@ -1,18 +1,18 @@
 {
-  "tools": {
-    "dotnet": "3.0.100-preview4-011144",
-    "vs": {
-      "version": "16.0"
+    "tools": {
+        "dotnet": "3.0.100-preview-010024",
+        "vs": {
+            "version": "16.0"
+        }
+    },
+    "sdk": {
+        "version": "3.0.100-preview-010024"
+    },
+    "msbuild-sdks": {
+        "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19214.2"
+    },
+    "native-tools": {
+        "strawberry-perl": "5.28.1.1-1",
+        "msvcurt-c1xx": "0.0.0.4"
     }
-  },
-  "sdk": {
-    "version": "3.0.100-preview4-011144"
-  },
-  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19214.2"
-  },
-  "native-tools": {
-    "strawberry-perl": "5.28.1.1-1",
-    "msvcurt-c1xx": "0.0.0.4"
-  }
 }