diff --git a/Directory.Build.props b/Directory.Build.props index e011dfe2e94..683daa4e917 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,8 +2,9 @@ wpf true + net7.0 + 7.0 - $(TestWpfArcadeSdkPath) diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index fdfda7ac3e2..9536cd9123c 100644 --- 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')"> Microsoft.Private.Winforms - + And $(TargetFramework) == 'net7.0' + And Exists('$(PkgMicrosoft_Private_Winforms)\ref\net6.0\%(MicrosoftPrivateWinFormsReference.Identity).dll')"> Microsoft.Private.Winforms diff --git a/global.json b/global.json index 5827137f738..562a0649cb0 100644 --- a/global.json +++ b/global.json @@ -1,23 +1,23 @@ { - "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.21623.2", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21623.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", diff --git 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 index f8d043d89b5..cf4fefdc48f 100644 --- 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 @@ -1,7 +1,7 @@  {B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3} - net6.0 + AnyCPU;x64;arm64 $(NoWarn);NU5111 diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj index 1201873821e..a77e1ef727a 100644 --- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj +++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj @@ -1,7 +1,7 @@  9a7e395b-e859-40e2-809d-efb72cf3a2ee - net6.0 + AnyCPU;x64;arm64 diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj index dfc37b4c272..3282af3f9cb 100644 --- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj +++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj @@ -1,7 +1,7 @@  c847934a-828c-4ebb-a004-b0e97c8313f4 - net6.0 + AnyCPU;x64;arm64 diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj index e90d171f99f..ac7c8328e0f 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj @@ -1,7 +1,7 @@  {BFF6C118-3369-43B5-ACA6-D65ED00EEBE0} - net6.0 + AnyCPU;x64;arm64 diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj index 242293a0c2a..2da6fb78938 100644 --- 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 @@ {440d06b8-e3de-4c0d-ad25-cd4f43d836e1} - net6.0 + AnyCPU;x64;arm64 diff --git 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 index 2e115642829..d26a26e537c 100644 --- 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 @@ - net6.0 + false diff --git 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 index 0fc7bc08e8f..176aca96319 100644 --- 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 @@ - net6.0 + false diff --git 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 index 10c694e454b..1226d24239f 100644 --- 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 @@ - net6.0 + false diff --git 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 index b417bb7df68..c2534c257ca 100644 --- 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 @@ - net6.0 + false diff --git 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 index e9394501e52..ac606a09bf0 100644 --- 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 @@ - net6.0 + false diff --git 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 index 35798fe2326..5cf0917e505 100644 --- 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 @@ - net6.0 + false diff --git 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 index bed129a10a7..a8d11bbb7b6 100644 --- 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 @@ - net6.0 + false diff --git 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 index 3ec95481ab8..ba0d0ce4a0e 100644 --- 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 @@ - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj index 5155bf4aa99..fdb4c372b81 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj @@ -27,9 +27,8 @@ - net6.0 + .NETCoreApp - v6.0 Unknown diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj index c64b136ab65..f747018d745 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj @@ -1,6 +1,6 @@  - net6.0 + AnyCPU;x64;arm64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj index 18b6f739da2..36dfefa35f2 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj @@ -1,6 +1,6 @@  - net6.0 + AnyCPU;x64;arm64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj index b5bc83a3496..596b7c8cf34 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj @@ -1,6 +1,6 @@  - net6.0 + AnyCPU;x64;arm64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj index 7b23d5cfdf8..089592777c0 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj @@ -1,6 +1,6 @@  - net6.0 + AnyCPU;x64;arm64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj index 8468e138ed2..c96df287a7a 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj @@ -1,6 +1,6 @@  - net6.0 + AnyCPU;x64;arm64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 2730e445a8b..8523efff9a5 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,6 @@  - net472;net6.0 + net472;net6.0;net7.0 false true diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 60873ee95df..dd775ca091c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -12,7 +12,7 @@ - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index e43cf804f12..34d8ee0e997 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -1,4 +1,4 @@ - + PresentationCore PresentationCore-ref @@ -11,7 +11,7 @@ MS.Internal.PresentationCore None AnyCPU;x64;arm64 - net6.0 + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index e3dae6dda6b..d50b8f23a55 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -12,7 +12,7 @@ - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index ff6742944ec..7ea4a0f4f46 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -1,4 +1,4 @@ - + PresentationFramework PresentationFramework-ref @@ -11,7 +11,7 @@ None AnyCPU;x64;arm64 false - net6.0 + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index a8bf385f0e8..a2335ec4161 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -2,7 +2,7 @@ - net6.0 + AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj index cd588f8f831..2d1155868d4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj @@ -1,9 +1,9 @@ - + PresentationUI PresentationUI-ref $(TargetGroup)-$(PackageId)/ - net6.0 + AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj index 0b5b5afd6a6..0b1e4d7c928 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj @@ -10,7 +10,7 @@ - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj index 9a90ac3c745..f6576bea982 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj @@ -1,4 +1,4 @@ - + ReachFramework ReachFramework-ref @@ -10,7 +10,7 @@ None AnyCPU;x64;arm64 false - net6.0 + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj index e7ef43e64b2..3ea30e2294e 100644 --- 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 @@ - net6.0 + .NETCoreApp v6.0 Unknown diff --git 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 index 19eeaed03d3..c2776b69197 100644 --- 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 @@ - net6.0 + false diff --git 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 index 6158c950e68..0205b4722b7 100644 --- 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 @@ - net6.0 + AnyCPU;x64;arm64 false $(DefineConstants);RIBBON_IN_FRAMEWORK diff --git 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 index a9d47478104..7658475e774 100644 --- 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 @@ System.Windows.Controls.Ribbon System.Windows.Controls.Ribbon-ref $(TargetGroup)-$(PackageId)/ - net6.0 + AnyCPU;x64;arm64 $(DefineConstants);RIBBON_IN_FRAMEWORK $(NoWarn);0618 diff --git 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 index 0d3ccebae65..a727e9bbb3a 100644 --- 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 @@ -1,6 +1,6 @@  - net6.0 + false AnyCPU;x64;arm64 diff --git 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 index 5ec300b2803..eb5f4bded3d 100644 --- 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 @@ -1,9 +1,9 @@ - + System.Windows.Input.Manipulations System.Windows.Input.Manipulations-ref $(TargetGroup)-$(PackageId)/ - net6.0 + AnyCPU;x64;arm64 diff --git 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 index abc905fa88c..034e6298919 100644 --- 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 @@ -1,6 +1,6 @@  - net6.0 + AnyCPU;x64;arm64 false false diff --git 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 index 120f5a5a8ac..b95c28362f9 100644 --- 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 @@ System.Windows.Presentation System.Windows.Presentation-ref $(TargetGroup)-$(PackageId)/ - net6.0 + AnyCPU;x64;arm64 false 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 9c20c463441..56c5680684e 100644 --- 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 @@ {9AC36357-34B7-40A1-95CA-FE9F46D089A7} System.Xaml - net6.0 + AnyCPU;x64;arm64 $(NoWarn);0618;NU5125;0618 $(DefineConstants);OLDRESOURCES;SYSTEM_XAML diff --git 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 index e04ebc5ffec..dcfb28d9118 100644 --- 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 @@ -1,9 +1,9 @@ - + System.Xaml System.Xaml-ref $(TargetGroup)-$(PackageId)/ - net6.0 + AnyCPU;x64;arm64 $(NoWarn);0618;NU5125;0618 $(DefineConstants);OLDRESOURCES;SYSTEM_XAML diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj index 7b21e9995fc..b7aacf881e1 100644 --- 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 @@ - net6.0 + None AnyCPU;x64;arm64 false diff --git 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 index a1a3caab315..306a127437c 100644 --- 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 @@ PresentationFramework.Aero PresentationFramework.Aero-ref $(TargetGroup)-$(PackageId)/ - net6.0 + None AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj index af3e3a4e391..4964d7d6f99 100644 --- 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 @@ - net6.0 + None AnyCPU;x64;arm64 false diff --git 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 index 2d127ff02e2..e11743b5c28 100644 --- 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 @@ PresentationFramework.Aero2 PresentationFramework.Aero2-ref $(TargetGroup)-$(PackageId)/ - net6.0 + None AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj index a6f48e93604..f5756f96944 100644 --- 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 @@ - net6.0 + None AnyCPU;x64;arm64 false diff --git 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 index e2b16ce97b1..58e037c7686 100644 --- 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 @@ PresentationFramework.AeroLite PresentationFramework.AeroLite-ref $(TargetGroup)-$(PackageId)/ - net6.0 + None AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj index 0b8a48d737a..5c3caa12da4 100644 --- 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 @@ - net6.0 + None AnyCPU;x64;arm64 false diff --git 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 index c48cbe27e4d..4b2bf52b9dc 100644 --- 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 @@ PresentationFramework.Classic PresentationFramework.Classic-ref $(TargetGroup)-$(PackageId)/ - net6.0 + None AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj index 0a86919673e..98d7ffc9426 100644 --- 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 @@ - net6.0 + None AnyCPU;x64;arm64 false diff --git 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 index 45794652b63..97c2317f4f0 100644 --- 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 @@ PresentationFramework.Luna PresentationFramework.Luna-ref $(TargetGroup)-$(PackageId)/ - net6.0 + None AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj index d0d8c10adc8..7a67eab4d74 100644 --- 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 @@ - net6.0 + None AnyCPU;x64;arm64 false diff --git 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 index 59cd3918785..aa15395e27a 100644 --- 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 @@ PresentationFramework.Royale PresentationFramework.Royale-ref $(TargetGroup)-$(PackageId)/ - net6.0 + None AnyCPU;x64;arm64 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj index 8fddd9cdc0b..8280a6a14e2 100644 --- 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);0618;CA1821 - net6.0 + false false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj index 2af12a91672..51b713c08b9 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj @@ -1,4 +1,4 @@ - + UIAutomationClient UIAutomationClient-ref @@ -7,7 +7,7 @@ true $(DefineConstants);UIAUTOMATIONCLIENT $(NoWarn);0618;CA1821 - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj index 017f39beb0c..87e393575f8 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj @@ -7,7 +7,7 @@ true - net6.0 + false false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj index 8cc470c5831..1e9ad448090 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj @@ -1,4 +1,4 @@ - + UIAutomationClientSideProviders UIAutomationClientSideProviders-ref @@ -7,7 +7,7 @@ $(DefineConstants);UIAUTOMATIONCLIENTSIDEPROVIDERS $(NoWarn);0618 true - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj index f6df1ff4e3b..87031ff545e 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj @@ -9,7 +9,7 @@ - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj index cacc14338ca..b7e7fd0b359 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj @@ -1,4 +1,4 @@ - + UIAutomationProvider UIAutomationProvider-ref @@ -9,7 +9,7 @@ MS.Internal.Automation SRID AnyCPU;x64;arm64 - net6.0 + diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj index 62fa3358271..2352762c376 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj @@ -9,7 +9,7 @@ - net6.0 + false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj index c07488ea768..7450967b812 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj @@ -1,4 +1,4 @@ - + UIAutomationTypes UIAutomationTypes-ref @@ -7,7 +7,7 @@ $(DefineConstants);UIAUTOMATIONTYPES $(NoWarn);0618 false - net6.0 + AnyCPU;x64;arm64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj index 9ca27cf6253..275822b9cae 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj @@ -7,7 +7,7 @@ $(NoWarn);0618 false {FA69991B-9696-42D0-A5C7-F5E73F0DEE9E} - net6.0 + AnyCPU;x64;arm64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj index 6f8d3b86fbc..9443cd6e9f4 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj @@ -1,4 +1,4 @@ - + WindowsBase WindowsBase-ref @@ -7,7 +7,7 @@ $(DefineConstants);WeakEventTelemetry $(NoWarn);0618 false - net6.0 + AnyCPU;x64;arm64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj index ebad5d94c44..768680e747d 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj @@ -6,7 +6,7 @@ None - net6.0 + false false diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj index 687a2ce470f..98981da49c9 100644 --- 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);WINDOWSFORMSINTEGRATION $(NoWarn);0618 None - net6.0 + false