Enable xunit testing in VS with the dispatcher (#10023)

* Remove NetCoreReference

This removes the `NetCoreReference` infrastructure and replaces it with `DefaultReferenceExclusion` to remove the one problematic implicit reference to WindowsBase.

Manually picking references was blocking using System.Private.Windows.Core from the WinForms repo. Not having this also greatly simplifies the projects.

This also tweaks the solution to add folders docs and eng items.

Fixes #9168

* Put back test projects in solution

* Enable xunit testing in VS with the dispatcher

This change enables writing and debugging unit tests in the Test Explorer in Visual Studio. I added a new test project for WindowsBase that has a unit test that launches the SplashScreen as an example.

In order to make this happen I had to reference the xunit.stafact package which introduced a number of challenges to overcome. The package has a reference to the desktop sdk and needs to be used in a project that targets `net10.0-windows`, not `net10.0`. To make everything work seamlessly I had to:

- Strip the platform reference
- Apply actual versions from the sdk
- Get rid of AnyCPU and explictly use x86 (everything has a native dependency)
- Enable transitive copying of references for the unit test projects
- Target the 10.0 SDK (would get version confusion otherwise)
- Add an override setting for WinForms which still targets the 9.0 SDK
- Remove other targets that were trying to fixup WindowsBase references from the .NET SDK
-

* Make PresentationBuildTasks always AnyCPU

* Update versions and tweak / simplify some version related stuff

* Attempt to turn on the binlog for the CI

* Update binlog names for both build and test run

* Try 17.12 preview

* Move back off of scout image

* Update versions

* Push back to 9.0

* Uncheck D3DCompiler in ConfigurationManager

* Have ref projects only reference ref projects and move ref and cycle breaker projects to AnyCPU.

* Normalize ARM64 to arm64. Having multiple casings was causing projects to be built multiple times to the same folder.

* Revert RuntimeFrameworkReference.targets changes

* Final cleanup pass

* Tweak SdkReferences.targets

* Respond to feedback

.editorconfig

@@ -13,11 +13,13 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[project.json]
+[*.json]
 indent_size = 2
 
 # C# files
 [*.cs]
+file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
+
 # New line preferences
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true

eng/Versions.props

@@ -43,6 +43,7 @@
     <SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24560.1</SystemSecurityCryptographyXmlPackageVersion>
     <SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24560.1</SystemSecurityPermissionsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24560.1</SystemWindowsExtensionsPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
   </PropertyGroup>
   <!-- Docs / Intellisense -->
   <PropertyGroup>

eng/WpfArcadeSdk/Sdk/Sdk.props

@@ -25,7 +25,7 @@
     -->
     <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('x64'))">win-$(Platform)</WpfRuntimeIdentifier>
     <WpfRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</WpfRuntimeIdentifier>
-    <WpfRuntimeIdentifier Condition="'$(Platform)'=='ARM64'">win-arm64</WpfRuntimeIdentifier>
+    <WpfRuntimeIdentifier Condition="'$(Platform)'=='arm64'">win-arm64</WpfRuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.props"/>

eng/WpfArcadeSdk/tools/ApiCompat.targets

@@ -61,14 +61,7 @@
       <ResolvedMatchingContract Include="$(OutputPath)$(AssemblyName).dll" Condition="'$(ManagedCxx)'=='true'" />
       <!-- Work backwards to find the output for a hand-crafted ref assembly. -->
       <ResolvedImplementationAssembly Remove="@(ResolvedImplementationAssembly)" />
-      <ResolvedImplementationAssembly Include="$(BaseOutputPath)..\$(AssemblyName)-ref\$(Platform)\$(Configuration)\**\$(AssemblyName).dll"
-                                     Condition="'$(WpfRuntimeIdentifier)'=='win-x64' or '$(WpfRuntimeIdentifier)'=='win-arm64'"/>
-      <ResolvedImplementationAssembly Include="$(BaseOutputPath)..\$(AssemblyName)-ref\$(Configuration)\**\$(AssemblyName).dll"
-                                      Condition="'$(WpfRuntimeIdentifier)'=='win-x86'"/>
-      <!-- If building a single project, Platform is used in win-x86.  Below handles this case. -->
-      <ResolvedImplementationAssembly Include="$(BaseOutputPath)..\$(AssemblyName)-ref\$(Platform)\$(Configuration)\**\$(AssemblyName).dll"
-                                      Condition="'$(WpfRuntimeIdentifier)'=='win-x86' and @(ResolvedImplementationAssembly->Count()) == 0"/>
-
+      <ResolvedImplementationAssembly Include="$(BaseOutputPath)..\$(AssemblyName)-ref\$(Configuration)\**\$(AssemblyName).dll" />
       <Error Condition="@(ResolvedImplementationAssembly->Count()) &gt; 1" Text="More than one reference assembly was added to ResolvedImplementationAssembly!" />
     </ItemGroup>
   </Target>

eng/WpfArcadeSdk/tools/FixupProjectReferences.targets

@@ -1,34 +1,4 @@
 <Project>
-  <!-- This workaround fixes an issue with ResolveAssemblyReferences task where it 
-       removes a reference to *project* WindowsBase.dll because *sdk reference* 
-       WindowsBase.dll exists in the list of references it resolves. -->
-  <Target Name="FixupProjectReferences" AfterTargets="ResolveAssemblyReferences">
-    <CallTarget Targets="ResolveProjectReferences" />
-    <ItemGroup>
-      <ReferencePath Remove="@(_ResolvedNativeProjectReferencePaths)" />
-      <ReferencePath Include="@(_ResolvedNativeProjectReferencePaths)" />
-
-      <ReferencePath Remove="@(_ResolvedProjectReferencePaths)" />
-      <ReferencePath Include="@(_ResolvedProjectReferencePaths)" />
-    </ItemGroup>
-    <ItemGroup>
-      <FilteredReferencePath Remove="@(FilteredReferencePath)" />
-    </ItemGroup>
-    <RemoveDuplicates Inputs="@(ReferencePath)">
-      <Output TaskParameter="Filtered" ItemName="FilteredReferencePath"/>
-    </RemoveDuplicates>
-    <ItemGroup>
-      <ReferencePath Remove="@(ReferencePath)" />
-      <ReferencePath Include="@(FilteredReferencePath)" />
-    </ItemGroup>
-    <RemoveDuplicates Inputs="@(ProjectReference)">
-      <Output TaskParameter="Filtered" ItemName="FilteredProjectReference"/>
-    </RemoveDuplicates>
-    <ItemGroup>
-      <ProjectReference Remove="@(ProjectReference)" />
-      <ProjectReference Include="@(FilteredProjectReference)" />
-    </ItemGroup>
-  </Target>
   <Target Name="DeDuplicateProjectReferenceWithConfiguration" AfterTargets="AssignProjectConfiguration">
     <RemoveDuplicates Inputs="@(ProjectReferenceWithConfiguration)">
       <Output TaskParameter="Filtered" ItemName="_filteredProjectReferenceWithConfiguration"/>
@@ -45,4 +15,4 @@
       <_ProjectReferenceWithConfiguration Include="@(_filtered_ProjectReferenceWithConfiguration)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>

eng/WpfArcadeSdk/tools/SdkReferences.targets

@@ -112,18 +112,18 @@
           Condition="'@(MicrosoftPrivateWinFormsReference)'!=''
                  And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
                  And $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0')) ">
+    <PropertyGroup>
+      <!-- Use the current TargetFramework if not otherwise specified for WinForms private package -->
+      <_WinFormsTargetFrameworkVersion Condition="'$(_WinFormsTargetFrameworkVersion)' == ''">$(TargetFramework)</_WinFormsTargetFrameworkVersion>
+    </PropertyGroup>
     <ItemGroup>
-      <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll"
-                 Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
-        <NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
-      </Reference>
-      <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
-                 Condition="!Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')
-                 And $(TargetFramework) == 'net9.0'
-                 And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net8.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
+      <Reference Include="$(PkgMicrosoft_Private_Winforms)\lib\$(_WinFormsTargetFrameworkVersion)\%(MicrosoftPrivateWinFormsReference.Identity).dll"
+                 Condition="Exists('$(PkgMicrosoft_Private_Winforms)\lib\$(_WinFormsTargetFrameworkVersion)\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
         <NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
       </Reference>
     </ItemGroup>
+    <Error Condition="!Exists('$(PkgMicrosoft_Private_Winforms)\lib\$(_WinFormsTargetFrameworkVersion)\%(MicrosoftPrivateWinFormsReference.Identity).dll')"
+           Text="$(PkgMicrosoft_Private_Winforms)\lib\$(_WinFormsTargetFrameworkVersion)\%(MicrosoftPrivateWinFormsReference.Identity).dll could not be found."/>
   </Target>
 
   <ItemGroup>
@@ -141,17 +141,16 @@
   -->
   <Target Name="FilterImplicitAssemblyReferences"
           Condition="'@(DefaultReferenceExclusion)' != ''"
-          DependsOnTargets="ResolveProjectReferences"
-          AfterTargets="ResolveTargetingPackAssets">
+          AfterTargets="ResolveTargetingPackAssets"
+          BeforeTargets="_HandlePackageFileConflicts;ResolveAssemblyReferences">
     <ItemGroup>
       <_referenceExclusion Include="@(DefaultReferenceExclusion)">
         <AssemblyName>%(DefaultReferenceExclusion.Identity)</AssemblyName>
-        <FrameworkReferenceName>Microsoft.NETCore.App</FrameworkReferenceName>
         <ExternallyResolved>true</ExternallyResolved>
       </_referenceExclusion>
 
       <Reference Remove="@(_referenceExclusion)"
-                 MatchOnMetadata="AssemblyName;FrameworkReferenceName;ExternallyResolved"/>
+                 MatchOnMetadata="AssemblyName;ExternallyResolved"/>
     </ItemGroup>
   </Target>
 </Project>

eng/WpfArcadeSdk/tools/TestProjects.targets

@@ -35,71 +35,26 @@
     <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" CopyLocal="true" />
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" CopyLocal="true" />
 
-
-
     <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
     <None Condition="'$(RuntimeIdentifier)'=='win-x64' And '$(Configuration)' != 'Debug'"
           Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
     <None Condition="'$(RuntimeIdentifier)'=='win-x64' And '$(Configuration)' == 'Debug'"
       Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng_Debug)\runtimes\$(RuntimeIdentifier)\native\*.dll"
       CopyToOutputDirectory="PreserveNewest"/>
-
-
+
     <None Condition="'$(RuntimeIdentifier)'=='win-x86' And '$(Configuration)' != 'Debug'"
            Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
     <None Condition="'$(RuntimeIdentifier)'=='win-x86' And '$(Configuration)' == 'Debug'"
        Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng_Debug)\runtimes\$(RuntimeIdentifier)\native\*.dll"
       CopyToOutputDirectory="PreserveNewest"/>
 
-    <_wpfProjectsNotWindowsBase Include="@(WpfProjectPath)" Exclude="WindowsBase" />
-    <_wpfProjectsWindowsBase Include="@(WpfProjectPath)" Exclude="@(_wpfProjectsWindowsBase)" />
-
-    <!-- 
-    Do not include WindowsBase. There is a bug in the SDK that will prevent proper deps.json generation when WindowsBase.csproj
-    and Microsoft.NetCore.App/WindowsBase.dll clash. Part of the problem is due to https://github.com/dotnet/sdk/issues/2674. 
-    
-    Directly referencing DLL's works correctly and generates good deps.json. So instead of reference WindowsBase.csproj, just
-    obtain the raw path to WindowsBase.dll and add it to @(Reference). This is safe to do since
-    WindowsBase will be built as a transitive reference via PresentationCore, PresentationFramework etc. 
-    
-    Also make sure that Microsoft.NetCore.App/WindowsBase.dll is removed from @(Reference). 
-    -->
-    <ProjectReference Include="@(_wpfProjectsNotWindowsBase->'%(ProjectPath)')" >
+    <ProjectReference Include="@(WpfProjectPath->'%(ProjectPath)')" >
       <Private>True</Private>
       <OutputItemType>_wpfProjectReferenceLocallyBuildAssemblies</OutputItemType>
     </ProjectReference>
-
-    <ProjectReference Include="@(_wpfProjectsWindowsBase->'%(ProjectPath)')" >
-      <Private>True</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>_windowsBaseAssemblyLocallyBuiltPath</OutputItemType>
-    </ProjectReference>
   </ItemGroup>
-
-  <PropertyGroup Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'">
-    <ResolveAssemblyReferencesDependsOn>
-      AddWindowsBaseToReferences;
-      $(ResolveAssemblyReferencesDependsOn)
-    </ResolveAssemblyReferencesDependsOn>
-  </PropertyGroup>
-
-  <Target Name="AddWindowsBaseToReferences">
-    <ItemGroup>
-      <Reference Include="%(_windowsBaseAssemblyLocallyBuiltPath.FullPath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="RemoveWindowsBaseNetCoreAppReference"
-          AfterTargets="ResolveTargetingPacks"
-          Returns="@(Reference)"
-          Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'">
-    <ItemGroup>
-      <Reference Remove="@(Reference)" Condition="'%(FileName)'=='WindowsBase' and '%(Reference.ResolvedFrom)'=='TargetingPack'" />
-    </ItemGroup>
-  </Target>
-
   <!-- 
     This target ensures that Microsoft.DotNet.Wpf.DncEng would not inadvertently over-supply references that 
     are already satisfied by ProjectReference's from within this repo. This should almost never happen, except
@@ -110,7 +65,7 @@
     AfterTargets="ResolveTargetingPacks"
     Returns="@(Reference)"
     Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'">
-    
+
     <ItemGroup>
       <_microsoftDotNetDncEngRefs Remove="@(_microsoftDotNetDncEngRefs)" />
       <_microsoftDotNetDncEngRefs Include="@(Reference)"

eng/WpfArcadeSdk/tools/Wpf.Cpp.props

@@ -21,8 +21,8 @@
     <Architecture Condition="'$(Architecture)'==''">x64</Architecture>
 
     <!-- This should always use either x86 or x64 --> 
-    <TraceWppArchitecture Condition="'$(Architecture)'=='ARM64'">x64</TraceWppArchitecture>
-    <TraceWppArchitecture Condition="'$(Architecture)'!='ARM64'">$(Architecture)</TraceWppArchitecture>
+    <TraceWppArchitecture Condition="'$(Architecture)'=='arm64'">x64</TraceWppArchitecture>
+    <TraceWppArchitecture Condition="'$(Architecture)'!='arm64'">$(Architecture)</TraceWppArchitecture>
     <TraceWpp>$(Windows10SdkPath)bin\$(WindowsTargetPlatformVersion)\$(TraceWppArchitecture)\tracewpp.exe</TraceWpp>
 
     <GenerateAssemblyInfo>$(ManagedCxx)</GenerateAssemblyInfo>

eng/pipeline-pr.yml

@@ -86,7 +86,7 @@ jobs:
         - name: _HelixCreator
           value: ${{ parameters.repoName }}
         - name: _programfilesx86
-          value: ${Env:ProgramFiles(x86)}/dotnet          
+          value: ${Env:ProgramFiles(x86)}/dotnet
         - name: _programfiles
           value:  ${Env:ProgramFiles}/dotnet
         - ${{ if ne(variables['System.TeamProject'], 'internal') }}:
@@ -167,7 +167,7 @@ jobs:
 
       # Use utility script to run script command dependent on agent OS.
       - script: eng\scripts\cibuild.cmd
-          -configuration $(_BuildConfig) 
+          -configuration $(_BuildConfig)
           -prepareMachine
           $(_PublishArgs)
           $(_SignArgs)
@@ -183,7 +183,7 @@ jobs:
         condition: or(ne(variables['_HelixPipeline'], 'true'), and(eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')))
 
       - script: eng\scripts\ciunittest.cmd
-          -configuration $(_BuildConfig) 
+          -configuration $(_BuildConfig)
           -prepareMachine
           $(_PublishArgs)
           $(_SignArgs)
@@ -198,11 +198,11 @@ jobs:
         displayName: Publish XUnit Test Results
         inputs:
           testResultsFormat: 'xUnit'
-          testResultsFiles: '*.xml' 
+          testResultsFiles: '*.xml'
           searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
           mergeTestResults: true
         continueOnError: true
-        condition: and(eq(variables['_BuildConfig'], 'Release'), ne(variables['_Platform'], 'arm64'))     
+        condition: and(eq(variables['_BuildConfig'], 'Release'), ne(variables['_Platform'], 'arm64'))
 
       # - task: PowerShell@2
       #   displayName: Install .NET Core

packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>{B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3}</ProjectGuid>
 
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>x86;x64;arm64</Platforms>
     <!-- We ignore this warning because we want to pack powershell scripts that won't be executed as part of installing this package. -->
     <NoWarn>$(NoWarn);NU5111</NoWarn>
   </PropertyGroup>

packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>9a7e395b-e859-40e2-809d-efb72cf3a2ee</ProjectGuid>
 
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>x86;x64;arm64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>

packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>c847934a-828c-4ebb-a004-b0e97c8313f4</ProjectGuid>
 
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>x86;x64;arm64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>

packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}</ProjectGuid>
 
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>x86;x64;arm64</Platforms>
     <UsingToolTemplateLocalizer>true</UsingToolTemplateLocalizer>    
   </PropertyGroup>
 

packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
 
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>x86;x64;arm64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj

@@ -6,7 +6,7 @@
     <ShouldWriteSigningRequired>false</ShouldWriteSigningRequired>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj

@@ -6,7 +6,7 @@
     <!-- don't sign nor binplace this non-shipping assembly -->
     <ShouldWriteSigningRequired>false</ShouldWriteSigningRequired>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>AnyCPU</Platforms>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <!--The field '{0}' is never used -->
     <NoWarn>$(NoWarn);0169</NoWarn>
@@ -21,11 +21,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\ref\PresentationCore-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\ref\UIAutomationProvider-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\ref\UIAutomationTypes-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\ref\System.Xaml-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\ref\WindowsBase-ref.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj

@@ -6,7 +6,7 @@
     <!-- don't sign nor binplace this non-shipping assembly -->
     <ShouldWriteSigningRequired>false</ShouldWriteSigningRequired>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Platforms>AnyCPU;x64;arm64</Platforms>
+    <Platforms>AnyCPU</Platforms>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
@@ -26,11 +26,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\ref\PresentationCore-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\ref\System.Xaml-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\ref\WindowsBase-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\ref\UIAutomationProvider-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\ref\UIAutomationTypes-ref.csproj" />
   </ItemGroup>
 
   <ItemGroup>