From 1d54091d5f17662b33c5a10ce691d0a66df66dbe Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Wed, 20 Jan 2021 10:22:48 -0800 Subject: [PATCH] Update WPF repo TFM from netcoreapp5.0 to net5.0 --- Documentation/projects-and-assemblies.md | 2 +- eng/WpfArcadeSdk/tools/SdkReferences.targets | 6 ++++++ eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 6 +++--- eng/copy-wpf.ps1 | 8 ++++---- eng/helixpublish.proj | 2 +- .../Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj | 2 +- .../Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj | 2 +- .../Microsoft.DotNet.Wpf.GitHub.csproj | 2 +- .../Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj | 2 +- .../PresentationFramework-PresentationUI-api-cycle.csproj | 2 +- ...PresentationFramework-ReachFramework-impl-cycle.csproj | 2 +- ...PresentationFramework-System.Printing-api-cycle.csproj | 2 +- ...resentationFramework-System.Printing-impl-cycle.csproj | 2 +- ...PresentationUI-PresentationFramework-impl-cycle.csproj | 2 +- .../ReachFramework-PresentationFramework-api-cycle.csproj | 2 +- .../ReachFramework-System.Printing-api-cycle.csproj | 2 +- ...System.Printing-PresentationFramework-api-cycle.csproj | 2 +- .../src/DirectWriteForwarder/DirectWriteForwarder.vcxproj | 2 +- .../PresentationFramework-SystemCore.csproj | 2 +- .../PresentationFramework-SystemData.csproj | 2 +- .../PresentationFramework-SystemDrawing.csproj | 2 +- .../PresentationFramework-SystemXml.csproj | 2 +- .../PresentationFramework-SystemXmlLinq.csproj | 2 +- .../src/PresentationCore/PresentationCore.csproj | 2 +- .../src/PresentationCore/ref/PresentationCore-ref.csproj | 2 +- .../PresentationFramework/PresentationFramework.csproj | 2 +- .../ref/PresentationFramework-ref.csproj | 2 +- .../src/PresentationUI/PresentationUI.csproj | 2 +- .../src/PresentationUI/ref/PresentationUI-ref.csproj | 2 +- .../src/ReachFramework/ReachFramework.csproj | 2 +- .../src/ReachFramework/ref/ReachFramework-ref.csproj | 2 +- .../src/System.Printing/System.Printing.vcxproj | 2 +- .../src/System.Printing/ref/System.Printing-ref.csproj | 2 +- .../System.Windows.Controls.Ribbon.csproj | 2 +- .../ref/System.Windows.Controls.Ribbon-ref.csproj | 2 +- .../System.Windows.Input.Manipulations.csproj | 2 +- .../ref/System.Windows.Input.Manipulations-ref.csproj | 2 +- .../System.Windows.Presentation.csproj | 2 +- .../ref/System.Windows.Presentation-ref.csproj | 2 +- .../src/System.Xaml/System.Xaml.csproj | 2 +- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 2 +- .../PresentationFramework.Aero.csproj | 2 +- .../ref/PresentationFramework.Aero-ref.csproj | 2 +- .../PresentationFramework.Aero2.csproj | 2 +- .../ref/PresentationFramework.Aero2-ref.csproj | 2 +- .../PresentationFramework.AeroLite.csproj | 2 +- .../ref/PresentationFramework.AeroLite-ref.csproj | 2 +- .../PresentationFramework.Classic.csproj | 2 +- .../ref/PresentationFramework.Classic-ref.csproj | 2 +- .../PresentationFramework.Luna.csproj | 2 +- .../ref/PresentationFramework.Luna-ref.csproj | 2 +- .../PresentationFramework.Royale.csproj | 2 +- .../ref/PresentationFramework.Royale-ref.csproj | 2 +- .../UIAutomationClient/UIAutomationClient.csproj | 2 +- .../UIAutomationClient/ref/UIAutomationClient-ref.csproj | 2 +- .../UIAutomationClientSideProviders.csproj | 2 +- .../ref/UIAutomationClientSideProviders-ref.csproj | 2 +- .../UIAutomationProvider/UIAutomationProvider.csproj | 2 +- .../ref/UIAutomationProvider-ref.csproj | 2 +- .../UIAutomationTypes/UIAutomationTypes.csproj | 2 +- .../UIAutomationTypes/ref/UIAutomationTypes-ref.csproj | 2 +- .../src/WindowsBase/WindowsBase.csproj | 2 +- .../src/WindowsBase/ref/WindowsBase-ref.csproj | 2 +- .../WindowsFormsIntegration.csproj | 2 +- .../ref/WindowsFormsIntegration-ref.csproj | 2 +- src/Microsoft.DotNet.Wpf/test/MultiTargeting.props | 4 ++-- 66 files changed, 77 insertions(+), 71 deletions(-) diff --git a/Documentation/projects-and-assemblies.md b/Documentation/projects-and-assemblies.md index f92fd756b94..f1d6159becc 100644 --- a/Documentation/projects-and-assemblies.md +++ b/Documentation/projects-and-assemblies.md @@ -92,7 +92,7 @@ The following assemblies are being produced today: | \---zh-Hant PresentationBuildTasks.resources.dll -\---netcoreapp5.0 +\---net5.0 | DirectWriteForwarder.dll | DirectWriteForwarder.pdb | PresentationCore.dll diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index 6e4053cab9c..7df00da9fde 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -199,6 +199,12 @@ Condition="Exists('$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll')"> Microsoft.Private.Winforms + + Microsoft.Private.Winforms + diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets index 1358e890b8a..45bf6476607 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets @@ -326,7 +326,7 @@ using namespace System::Runtime::Versioning; - netcoreapp5.0 + net5.0 AnyCPU%3Bx64 ]]> @@ -472,7 +472,7 @@ using namespace System::Runtime::Versioning; - netcoreapp5.0 + net5.0 AnyCPU%3Bx64 ]]> @@ -549,7 +549,7 @@ using namespace System::Runtime::Versioning; $(TargetFramework) - netcoreapp5.0 + net5.0 - netcoreapp5.0 + net5.0 true $(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 bb32386f525..5af1f2df7f5 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 - netcoreapp5.0 + net5.0 AnyCPU;x64 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 ea304f20443..05bec6eafd6 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 - netcoreapp5.0 + net5.0 AnyCPU;x64 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 2d38105a39c..12a2c2898c1 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 @@ -1,7 +1,7 @@  {440d06b8-e3de-4c0d-ad25-cd4f43d836e1} - netcoreapp5.0 + net5.0 AnyCPU;x64 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 83b3b1334bd..106719f6228 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 @@ - netcoreapp5.0 + net5.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 a1c8171e56e..4baadb95a90 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 @@ - netcoreapp5.0 + net5.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 96183e54251..ec04182bdd3 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 @@ - netcoreapp5.0 + net5.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 a86bed3dff5..7eeb765e1a6 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 @@ - netcoreapp5.0 + net5.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 fb78e2b72ee..b6d59faaac4 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 @@ - netcoreapp5.0 + net5.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 9655c22972d..6c51126e045 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 @@ - netcoreapp5.0 + net5.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 7541a9620e1..13929fb6751 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 @@ - netcoreapp5.0 + net5.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 6ebf44de104..f3d88f57b6e 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 @@ - netcoreapp5.0 + net5.0 false diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj index 8514fcb93cb..225a7666d2a 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj @@ -20,7 +20,7 @@ - netcoreapp5.0 + net5.0 .NETCoreApp v5.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 e41fc6f43ce..1501dfcad9e 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 @@  - netcoreapp5.0 + net5.0 AnyCPU;x64 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 889ee0ec2cc..580bb715e71 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 @@  - netcoreapp5.0 + net5.0 AnyCPU;x64 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 dbd386d8643..55c35b03fd2 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 @@  - netcoreapp5.0 + net5.0 AnyCPU;x64 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 edd38e4bbe6..1853ed85c70 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 @@  - netcoreapp5.0 + net5.0 AnyCPU;x64 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 8fe8ebfaa03..dbce6b0f527 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 @@  - netcoreapp5.0 + net5.0 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 172b9c58a98..47f6c205b74 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -13,7 +13,7 @@ - netcoreapp5.0 + net5.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 7970ca5ebdd..ab71d4a284b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -11,7 +11,7 @@ MS.Internal.PresentationCore None AnyCPU;x64 - netcoreapp5.0 + net5.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index 23560c1efcf..652c032194e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -12,7 +12,7 @@ - netcoreapp5.0 + net5.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 0506a6623dc..05bc0f7418a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -11,7 +11,7 @@ None AnyCPU;x64 false - netcoreapp5.0 + net5.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index 37fcf09b178..45919df9b58 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -2,7 +2,7 @@ - netcoreapp5.0 + net5.0 AnyCPU;x64 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 9c1ee92a853..41d23c308b0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj @@ -3,7 +3,7 @@ PresentationUI PresentationUI-ref $(TargetGroup)-$(PackageId)/ - netcoreapp5.0 + net5.0 AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj index 1196d17f4b5..cb8c15c7707 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj @@ -10,7 +10,7 @@ - netcoreapp5.0 + net5.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 3ba253f261d..14707aed83a 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj @@ -10,7 +10,7 @@ None AnyCPU;x64 false - netcoreapp5.0 + net5.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 eb45a0f66b0..d082bfee377 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj @@ -20,7 +20,7 @@ - netcoreapp5.0 + net5.0 .NETCoreApp v5.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 b5a61ea2494..1fe35f2d225 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 @@ - netcoreapp5.0 + net5.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 96f8c468c32..853b56ca65e 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 @@ - netcoreapp5.0 + net5.0 AnyCPU;x64 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 04f6c5451c2..a9ef7298aa1 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)/ - netcoreapp5.0 + net5.0 AnyCPU;x64 $(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 0777207c041..328d9d7b522 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 @@  - netcoreapp5.0 + net5.0 false AnyCPU;x64 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 ff273f39699..f71e5bb989a 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 @@ -3,7 +3,7 @@ System.Windows.Input.Manipulations System.Windows.Input.Manipulations-ref $(TargetGroup)-$(PackageId)/ - netcoreapp5.0 + net5.0 AnyCPU;x64 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 4c6632af21a..5dc6f5b5b9e 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 @@  - netcoreapp5.0 + net5.0 AnyCPU;x64 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 28105b534fe..68f09d9e3e3 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)/ - netcoreapp5.0 + net5.0 AnyCPU;x64 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 d1c835cbbd1..c529ab7a387 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 - netcoreapp5.0 + net5.0 AnyCPU;x64 $(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 e70b9cddbe5..3d6ac3e6fd3 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 @@ -3,7 +3,7 @@ System.Xaml System.Xaml-ref $(TargetGroup)-$(PackageId)/ - netcoreapp5.0 + net5.0 AnyCPU;x64 $(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 3bedd5214b6..afa07189e3a 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 @@ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 c0a0ba61fab..7fbf790aeb1 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)/ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 b45ee1e73b1..246920dd431 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 @@ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 069575f3cc2..78f8fc295a0 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)/ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 3547a332556..142bc48a92f 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 @@ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 4a2efebb33b..ff4e6493212 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)/ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 191c28587c3..afc3b2b1635 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 @@ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 731e2cf4917..ef3ac897cda 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)/ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 ea3f45b8397..ad1a481734d 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 @@ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 29183eccd61..2678b40ae60 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)/ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 29a7563c127..7f62c6e4d74 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 @@ - netcoreapp5.0 + net5.0 None AnyCPU;x64 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 d2ca2a42181..228f3b5ecda 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)/ - netcoreapp5.0 + net5.0 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj index 8502bf07bea..8392d68a5cb 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 - netcoreapp5.0 + net5.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 98b90a998d6..2892ac5d6f6 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 @@ -7,7 +7,7 @@ true $(DefineConstants);UIAUTOMATIONCLIENT $(NoWarn);0618;CA1821 - netcoreapp5.0 + net5.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 7b3d1051f5f..1ab0022fa52 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 - netcoreapp5.0 + net5.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 aa08d94fbf8..1d87442352b 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 @@ -7,7 +7,7 @@ $(DefineConstants);UIAUTOMATIONCLIENTSIDEPROVIDERS $(NoWarn);0618 true - netcoreapp5.0 + net5.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 3974eff5602..60577e38a32 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 @@ - netcoreapp5.0 + net5.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 7d37e7f305a..98e765c7c94 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 @@ -9,7 +9,7 @@ MS.Internal.Automation SRID AnyCPU;x64 - netcoreapp5.0 + net5.0 diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj index 68d59de0e2d..e6fbea62c30 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 @@ - netcoreapp5.0 + net5.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 1dbb0e210c2..cc8332f1eec 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 @@ -7,7 +7,7 @@ $(DefineConstants);UIAUTOMATIONTYPES $(NoWarn);0618 false - netcoreapp5.0 + net5.0 AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj index 98e9c40166f..aae5d4f53b0 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} - netcoreapp5.0 + net5.0 AnyCPU;x64 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 02269305c1a..b1fcca7da45 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj @@ -7,7 +7,7 @@ $(DefineConstants);WeakEventTelemetry $(NoWarn);0618 false - netcoreapp5.0 + net5.0 AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj index b731082e39a..2aac6d5b379 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj @@ -6,7 +6,7 @@ None - netcoreapp5.0 + net5.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 f2fa0914a06..b00a927b780 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 - netcoreapp5.0 + net5.0 false diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props index 397197fcc4a..32b1a0e9326 100644 --- a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props +++ b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props @@ -1,6 +1,6 @@ - netcoreapp5.0 + net5.0 @@ -21,7 +21,7 @@ $(DefineConstants);NETCOREAPP3_0 $(DefineConstants);NETCOREAPP3_1 - $(DefineConstants);NETCOREAPP5_0 + $(DefineConstants);NETCOREAPP5_0