Change TFM version to net7.0 (#5901)

* Change TFM version to net7.0 * Update SDK reference Targets: * Revert "Update SDK reference Targets:" This reverts commit 9fcd2a2fe24cd2cdba62cc968015a3d40e054e76. * update sdk/tools version to be in sync with winforms * Include winforms for net7.0 * update fallback to 6.0

Change TFM version to net7.0 (#5901)
* Change TFM version to net7.0 * Update SDK reference Targets: * Revert "Update SDK reference Targets:" This reverts commit 9fcd2a2fe24cd2cdba62cc968015a3d40e054e76. * update sdk/tools version to be in sync with winforms * Include winforms for net7.0 * update fallback to 6.0
fbaaa430 · Ashish Kumar Singh · GitHub · 9a604cbc · fbaaa430 · fbaaa430
65 changed file
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,8 +2,9 @@
  <PropertyGroup>
    <RepositoryName>wpf</RepositoryName>
    <WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
+    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworkVersion>7.0</TargetFrameworkVersion>
  </PropertyGroup>
-
  <!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
  <PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
    <WpfArcadeSdkPath>$(TestWpfArcadeSdkPath)</WpfArcadeSdkPath>

--- a/eng/WpfArcadeSdk/tools/SdkReferences.targets
+++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets
@@ -202,10 +202,10 @@
                 Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
        <NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
      </Reference>
-      <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\netcoreapp5.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
+      <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\net6.0\%(MicrosoftPrivateWinFormsReference.Identity).dll"
                 Condition="!Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')
-                 And $(TargetFramework) == 'net6.0'
-                 And Exists('$(PkgMicrosoft_Private_Winforms)\ref\netcoreapp5.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
+                 And $(TargetFramework) == 'net7.0'
+                 And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net6.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')">
        <NuGetPackageId>Microsoft.Private.Winforms</NuGetPackageId>
      </Reference>
    </ItemGroup>

--- a/global.json
+++ b/global.json
 {
-  "tools": {
-    "dotnet": "6.0.100",
-    "runtimes": {
-      "dotnet": [
-        "2.1.7",
-        "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
-      ]
+    "tools": {
+        "dotnet": "7.0.100-alpha.1.22053.1",
+        "runtimes": {
+            "dotnet": [
+                "2.1.7",
+                "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
+            ]
+        },
+        "vs": {
+            "version": "16.11"
+        }
    },
-    "vs": {
-      "version": "16.11"
-    }
-  },
  "msbuild-sdks": {
    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22053.2",
    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22053.2"
  },
-  "sdk": {
-    "version": "6.0.100"
-  },
+    "sdk": {
+        "version": "7.0.100-alpha.1.22053.1"
+    },
  "native-tools": {
    "strawberry-perl": "5.28.1.1-1",
    "net-framework-48-ref-assemblies": "0.0.0.1",

--- a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <ProjectGuid>{B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3}</ProjectGuid>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;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>

--- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <ProjectGuid>9a7e395b-e859-40e2-809d-efb72cf3a2ee</ProjectGuid>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <ProjectGuid>c847934a-828c-4ebb-a004-b0e97c8313f4</ProjectGuid>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <ProjectGuid>{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}</ProjectGuid>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj
@@ -13,7 +13,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj
@@ -11,7 +11,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj
@@ -13,7 +13,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj
@@ -12,7 +12,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-PresentationFramework-api-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-PresentationFramework-api-cycle.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-System.Printing-api-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-System.Printing-api-cycle.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/System.Printing/System.Printing-PresentationFramework-api-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/System.Printing/System.Printing-PresentationFramework-api-cycle.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
@@ -27,9 +27,8 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
    <RestoreProjectStyle>Unknown</RestoreProjectStyle>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
    <EnableDefaultItems>false</EnableDefaultItems>
    <EnablePInvokeAnalyzer>true</EnablePInvokeAnalyzer>


--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
@@ -12,7 +12,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.SDK">
  <PropertyGroup>
    <AssemblyName>PresentationCore</AssemblyName>
    <PackageId>PresentationCore-ref</PackageId>
@@ -11,7 +11,7 @@
    <GenerateResourcesSRNamespace>MS.Internal.PresentationCore</GenerateResourcesSRNamespace>
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
-    <TargetFramework>net6.0</TargetFramework>
+    
  </PropertyGroup>

  <ItemGroup>

--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
@@ -12,7 +12,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>  
+      
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.SDK">
  <PropertyGroup>
    <AssemblyName>PresentationFramework</AssemblyName>
    <PackageId>PresentationFramework-ref</PackageId>
@@ -11,7 +11,7 @@
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>
-    <TargetFramework>net6.0</TargetFramework>
+    
  </PropertyGroup>

  <ItemGroup>

--- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
@@ -2,7 +2,7 @@
  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>

    <EnableDefaultItems>false</EnableDefaultItems>

--- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>PresentationUI</AssemblyName>
    <PackageId>PresentationUI-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>

--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>ReachFramework</AssemblyName>
    <PackageId>ReachFramework-ref</PackageId>
@@ -10,7 +10,7 @@
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>
-    <TargetFramework>net6.0</TargetFramework>
+    
  </PropertyGroup>

  <ItemGroup>

--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -27,7 +27,7 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
    <RestoreProjectStyle>Unknown</RestoreProjectStyle>

--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <DefineConstants>$(DefineConstants);RIBBON_IN_FRAMEWORK</DefineConstants>

--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj
@@ -4,7 +4,7 @@
    <AssemblyName>System.Windows.Controls.Ribbon</AssemblyName>
    <PackageId>System.Windows.Controls.Ribbon-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <DefineConstants>$(DefineConstants);RIBBON_IN_FRAMEWORK</DefineConstants>
    <NoWarn>$(NoWarn);0618</NoWarn>

--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>

--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/ref/System.Windows.Input.Manipulations-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/ref/System.Windows.Input.Manipulations-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>System.Windows.Input.Manipulations</AssemblyName>
    <PackageId>System.Windows.Input.Manipulations-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/System.Windows.Presentation.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/System.Windows.Presentation.csproj
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/ref/System.Windows.Presentation-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/ref/System.Windows.Presentation-ref.csproj
@@ -3,7 +3,7 @@
    <AssemblyName>System.Windows.Presentation</AssemblyName>
    <PackageId>System.Windows.Presentation-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>

--- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
@@ -2,7 +2,7 @@
  <PropertyGroup>
    <ProjectGuid>{9AC36357-34B7-40A1-95CA-FE9F46D089A7}</ProjectGuid>
    <AssemblyName>System.Xaml</AssemblyName>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <NoWarn>$(NoWarn);0618;NU5125;0618</NoWarn>
    <DefineConstants>$(DefineConstants);OLDRESOURCES;SYSTEM_XAML</DefineConstants>

--- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj
-<Project Sdk="Microsoft.NET.SDK">
+<Project Sdk="Microsoft.NET.SDK">
  <PropertyGroup>
    <AssemblyName>System.Xaml</AssemblyName>
    <PackageId>System.Xaml-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <NoWarn>$(NoWarn);0618;NU5125;0618</NoWarn>
    <DefineConstants>$(DefineConstants);OLDRESOURCES;SYSTEM_XAML</DefineConstants>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj
@@ -5,7 +5,7 @@
    <AssemblyName>PresentationFramework.Aero</AssemblyName>
    <PackageId>PresentationFramework.Aero-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj
@@ -5,7 +5,7 @@
    <AssemblyName>PresentationFramework.Aero2</AssemblyName>
    <PackageId>PresentationFramework.Aero2-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj
@@ -5,7 +5,7 @@
    <AssemblyName>PresentationFramework.AeroLite</AssemblyName>
    <PackageId>PresentationFramework.AeroLite-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj
@@ -5,7 +5,7 @@
    <AssemblyName>PresentationFramework.Classic</AssemblyName>
    <PackageId>PresentationFramework.Classic-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj
@@ -5,7 +5,7 @@
    <AssemblyName>PresentationFramework.Luna</AssemblyName>
    <PackageId>PresentationFramework.Luna-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj
@@ -3,7 +3,7 @@

  <PropertyGroup>

-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj
@@ -5,7 +5,7 @@
    <AssemblyName>PresentationFramework.Royale</AssemblyName>
    <PackageId>PresentationFramework.Royale-ref</PackageId>
    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
    <Platforms>AnyCPU;x64;arm64</Platforms>
    <GenerateDependencyFile>false</GenerateDependencyFile>

--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
@@ -7,7 +7,7 @@
    <NoWarn>$(NoWarn);0618;CA1821</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>

--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>UIAutomationClient</AssemblyName>
    <PackageId>UIAutomationClient-ref</PackageId>
@@ -7,7 +7,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefineConstants>$(DefineConstants);UIAUTOMATIONCLIENT</DefineConstants>
    <NoWarn>$(NoWarn);0618;CA1821</NoWarn>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj
@@ -7,7 +7,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>

--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>UIAutomationClientSideProviders</AssemblyName>
    <PackageId>UIAutomationClientSideProviders-ref</PackageId>
@@ -7,7 +7,7 @@
    <DefineConstants>$(DefineConstants);UIAUTOMATIONCLIENTSIDEPROVIDERS</DefineConstants>
    <NoWarn>$(NoWarn);0618</NoWarn>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>UIAutomationProvider</AssemblyName>
    <PackageId>UIAutomationProvider-ref</PackageId>
@@ -9,7 +9,7 @@
    <GenerateResourcesSRNamespace>MS.Internal.Automation</GenerateResourcesSRNamespace>
    <GenerateResourcesResourcesClassName>SRID</GenerateResourcesResourcesClassName>
    <Platforms>AnyCPU;x64;arm64</Platforms>
-    <TargetFramework>net6.0</TargetFramework>
+    
  </PropertyGroup>

  <ItemGroup>

--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>UIAutomationTypes</AssemblyName>
    <PackageId>UIAutomationTypes-ref</PackageId>
@@ -7,7 +7,7 @@
    <DefineConstants>$(DefineConstants);UIAUTOMATIONTYPES</DefineConstants>
    <NoWarn>$(NoWarn);0618</NoWarn>
    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
@@ -7,7 +7,7 @@
    <NoWarn>$(NoWarn);0618</NoWarn>
    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
    <ProjectGuid>{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}</ProjectGuid>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <AssemblyName>WindowsBase</AssemblyName>
    <PackageId>WindowsBase-ref</PackageId>
@@ -7,7 +7,7 @@
    <DefineConstants Condition="'$(WeakEventTelemetry)'=='true'">$(DefineConstants);WeakEventTelemetry</DefineConstants>
    <NoWarn>$(NoWarn);0618</NoWarn>
    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <Platforms>AnyCPU;x64;arm64</Platforms>
  </PropertyGroup>


--- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
@@ -6,7 +6,7 @@
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
  </PropertyGroup>
  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <EnableDefaultItems>false</EnableDefaultItems>
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>

--- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj
@@ -7,7 +7,7 @@
    <DefineConstants>$(DefineConstants);WINDOWSFORMSINTEGRATION</DefineConstants>
    <NoWarn>$(NoWarn);0618</NoWarn>
    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <TargetFramework>net6.0</TargetFramework>
+    
    <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>
  <ItemGroup>