From 08d4776856ce582f8c043de2c72c630c70895430 Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Wed, 3 Feb 2021 13:04:05 -0800 Subject: [PATCH] Update WPF to build against newest released version of the SDK (.NET 6.0 Preview1) (#4123) * Update .NET SDK to 6.0.100-preview.1.21077.13 * Update VS version to 16.8 * Update C++/CLI projects to v6.0 * Update managed projects from .NET 5.0 to .NET 6.0 * Update C++/CLI projects to .NET 6.0 * Update multitargeting.props to .NET 6.0 * Update WpfArcadeSdk to .NET 6.0. Fix intellisense issue. * Update WpfSdk v5.0 to v6.0. Fix WinForms accessibility reference. * Suppress validate platform compatibility. WPF only builds for Windows. * Update packages to .NET 6.0 --- eng/WpfArcadeSdk/Sdk/Sdk.props | 13 +++++++++++++ eng/WpfArcadeSdk/tools/ReferenceAssembly.targets | 2 +- .../tools/RuntimeFrameworkReference.props | 2 +- .../tools/RuntimeFrameworkReference.targets | 4 ++-- eng/WpfArcadeSdk/tools/SdkReferences.targets | 8 ++++---- eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 6 +++--- eng/WpfArcadeSdk/tools/WpfProjectReference.targets | 2 +- eng/common/performance/performance-setup.ps1 | 4 ++-- eng/common/performance/performance-setup.sh | 2 +- eng/copy-wpf.ps1 | 8 ++++---- eng/helixpublish.proj | 2 +- global.json | 6 +++--- ...crosoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj | 2 +- .../Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj | 2 +- .../Microsoft.DotNet.Wpf.GitHub.csproj | 2 +- ...t.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj | 2 +- ...rosoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj | 2 +- ...ntationFramework-PresentationUI-api-cycle.csproj | 2 +- ...tationFramework-ReachFramework-impl-cycle.csproj | 2 +- ...tationFramework-System.Printing-api-cycle.csproj | 2 +- ...ationFramework-System.Printing-impl-cycle.csproj | 2 +- ...tationUI-PresentationFramework-impl-cycle.csproj | 2 +- ...Framework-PresentationFramework-api-cycle.csproj | 2 +- .../ReachFramework-System.Printing-api-cycle.csproj | 2 +- ....Printing-PresentationFramework-api-cycle.csproj | 2 +- .../DirectWriteForwarder.vcxproj | 4 ++-- .../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 +- .../ref/PresentationCore-ref.csproj | 2 +- .../PresentationFramework.csproj | 2 +- .../ref/PresentationFramework-ref.csproj | 2 +- .../src/PresentationUI/PresentationUI.csproj | 2 +- .../PresentationUI/ref/PresentationUI-ref.csproj | 2 +- .../src/ReachFramework/ReachFramework.csproj | 2 +- .../ReachFramework/ref/ReachFramework-ref.csproj | 2 +- .../src/System.Printing/System.Printing.vcxproj | 4 ++-- .../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 +- .../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 +- .../ref/UIAutomationClient-ref.csproj | 2 +- .../UIAutomationClientSideProviders.csproj | 2 +- .../ref/UIAutomationClientSideProviders-ref.csproj | 2 +- .../UIAutomationProvider.csproj | 2 +- .../ref/UIAutomationProvider-ref.csproj | 2 +- .../UIAutomationTypes/UIAutomationTypes.csproj | 2 +- .../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 ++-- 74 files changed, 101 insertions(+), 88 deletions(-) diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index e500f12e20f..2c86e4c285c 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -87,6 +87,19 @@ ** Note**: AdditionalNoWarn should not be used in projects/props/targets. --> $(AdditionalNoWarn);$(NoWarn) + + + + $(NoWarn);CA1416 diff --git a/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets b/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets index b9fcfbf2ceb..db2755f3ddb 100644 --- a/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets +++ b/eng/WpfArcadeSdk/tools/ReferenceAssembly.targets @@ -49,7 +49,7 @@ 0.0.0.3 $(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net5.0\$(DotNetApiDocsNet50)\_intellisense\net-5.0\ diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props index 7cbfe433bc3..4d5eae3f4d2 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props @@ -3,7 +3,7 @@ $(MicrosoftNETCoreAppRuntimewinx64Version) + ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0')">$(MicrosoftNETCoreAppRuntimewinx64Version) diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index 54426b83d09..b5d2f5cc7cb 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -16,7 +16,7 @@ Condition="'$(MicrosoftNETCoreAppRefVersion)'!='' And '$(NoTargets)'!='true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' - And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0') + And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0') And '$(MSBuildProjectExtension)'!='.vcxproj'"> $(MicrosoftNETCoreAppRefVersion) @@ -30,6 +30,6 @@ - + diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index fbc3b63f8e6..fdfda7ac3e2 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -6,7 +6,7 @@ GeneratePathProperty="True" Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' - And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0') + And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v6.0') And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/> diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 0edb2ae276e..a07ba0363b0 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -3,7 +3,7 @@ Param( [string] $CoreRootDirectory, [string] $BaselineCoreRootDirectory, [string] $Architecture="x64", - [string] $Framework="net5.0", + [string] $Framework="net6.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, [string] $Branch=$env:BUILD_SOURCEBRANCH, @@ -36,7 +36,7 @@ $HelixSourcePrefix = "pr" $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" # TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5. -if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) { +if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net6.0")) { $Queue = "Windows.10.Amd64.ClientRS5.Open" } diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 7321feb5c7e..365cc22a083 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= baseline_core_root_directory= architecture=x64 -framework=net5.0 +framework=net6.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME branch=$BUILD_SOURCEBRANCH diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1 index cf1c40d7d50..b204ae4b91b 100644 --- a/eng/copy-wpf.ps1 +++ b/eng/copy-wpf.ps1 @@ -59,11 +59,11 @@ function CopyNativeBinariesToLocation($location, $localBinLocation) function CopyManagedBinariesToLocation($location, $localBinLocation) { # Layout of where the managed binaries looks something like this: - # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\net5.0 - # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\net5.0 + # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\net6.0 + # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\net6.0 $PackageName = "Microsoft.DotNet.Wpf.GitHub" - $BinaryLocationInPackage = "net5.0" + $BinaryLocationInPackage = "net6.0" CopyPackagedBinaries $location $localBinLocation $PackageName $BinaryLocationInPackage } @@ -153,7 +153,7 @@ elseif($testhost) else { $runtimeIdentifer = "win-$arch" - $location = [System.IO.Path]::Combine($destination, "bin\Debug\net5.0", $runtimeIdentifer, "publish") + $location = [System.IO.Path]::Combine($destination, "bin\Debug\net6.0", $runtimeIdentifer, "publish") if(![System.IO.Directory]::Exists($location)) { Write-Host "App publishing directory unavailable: " $location -ForegroundColor Red diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj index 0b5ec2397ab..9c781499f3f 100644 --- a/eng/helixpublish.proj +++ b/eng/helixpublish.proj @@ -1,7 +1,7 @@ - net5.0 + net6.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 09fe6a9509c..1201873821e 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 - net5.0 + 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 b141ceb049c..dfc37b4c272 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 - net5.0 + 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 66db36f5ea5..e90d171f99f 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} - net5.0 + 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 ea204d019b2..275fd4a4cb9 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} - net5.0 + 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 42b1306ce20..2e115642829 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 @@ - net5.0 + 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 5aa78246104..0fc7bc08e8f 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 @@ - net5.0 + 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 f011b1ce087..10c694e454b 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 @@ - net5.0 + 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 27fe84b3fbd..b417bb7df68 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 @@ - net5.0 + 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 15ab826a3eb..e9394501e52 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 @@ - net5.0 + 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 12167621a55..35798fe2326 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 @@ - net5.0 + 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 175322faebf..bed129a10a7 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 @@ - net5.0 + 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 4f66b0980da..3ec95481ab8 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 @@ - net5.0 + net6.0 false diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj index 5070ac30302..5155bf4aa99 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj @@ -27,9 +27,9 @@ - net5.0 + net6.0 .NETCoreApp - v5.0 + 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 853d1f88451..c64b136ab65 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 @@  - net5.0 + 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 28fa4c508fd..18b6f739da2 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 @@  - net5.0 + 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 5fd9a6b33a6..b5bc83a3496 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 @@  - net5.0 + 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 3b3a111130e..7b23d5cfdf8 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 @@  - net5.0 + 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 c8e35dabc0e..8468e138ed2 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 @@  - net5.0 + net6.0 AnyCPU;x64;arm64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 5cf8b9127e3..f26ab3689d2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -13,7 +13,7 @@ - net5.0 + 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 14fa81274b9..c6822e3b5db 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;arm64 - net5.0 + net6.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index fd734a55b57..ce28b7dd917 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -12,7 +12,7 @@ - net5.0 + 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 63900d8e319..563962f8bee 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;arm64 false - net5.0 + net6.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index 866f96b3c26..b1a2b4ee490 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -2,7 +2,7 @@ - net5.0 + 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 6aec86c5ef1..cd588f8f831 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)/ - net5.0 + 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 007f2107731..c7ea5df69f3 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj @@ -10,7 +10,7 @@ - net5.0 + 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 0109aaca36c..9a90ac3c745 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;arm64 false - net5.0 + 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 b05984beb13..4fa15a2842f 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj @@ -27,9 +27,9 @@ - net5.0 + net6.0 .NETCoreApp - v5.0 + 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 5ebe76bbc1b..19eeaed03d3 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 @@ - net5.0 + 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 3aa93f49b18..f2fa5e8c3f1 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 @@ - net5.0 + 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 8fa3363c649..a702d88a0e8 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)/ - net5.0 + 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 40fa2fb7d80..0d3ccebae65 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 @@  - net5.0 + 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 1d39ade71cf..5ec300b2803 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)/ - net5.0 + 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 39c757c0688..abc905fa88c 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 @@  - net5.0 + 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 73357a90947..120f5a5a8ac 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)/ - net5.0 + 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 f09e9699c51..31f9260cad2 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 - net5.0 + 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 0c1d5cc729b..e04ebc5ffec 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)/ - net5.0 + 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 9f952d8b94b..90c1a29d730 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 @@ - net5.0 + 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 656548051bd..ed2977b4612 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)/ - net5.0 + 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 12797f98f47..48aec435889 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 @@ - net5.0 + 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 6a106b82cae..e289e03c9ed 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)/ - net5.0 + 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 743e50a198f..faac2f590b9 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 @@ - net5.0 + 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 5fd8752e478..0f59f057716 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)/ - net5.0 + 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 bc616ad5b17..cabbf536c83 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 @@ - net5.0 + 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 25a20680f47..e6641c0d1ef 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)/ - net5.0 + 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 4591b28d07e..749909bb5f4 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 @@ - net5.0 + 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 16462a18a5b..b035589685c 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)/ - net5.0 + 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 8b92fa768e3..a479cd0cea9 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 @@ - net5.0 + 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 530d77e08eb..88cb44c8acb 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)/ - net5.0 + 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 cc4f339ea50..2ccf4270b24 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 - net5.0 + 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 2b34d60434d..2af12a91672 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 - net5.0 + 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 f6b62823db1..017f39beb0c 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 - net5.0 + 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 3b3a1f969ef..8cc470c5831 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 - net5.0 + 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 216f38029bc..6950c157975 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 @@ - net5.0 + 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 0ceef278230..7440f25a270 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;arm64 - net5.0 + 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 2fe0ddd5d26..56224cce98b 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 @@ - net5.0 + 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 da8143fabb0..c07488ea768 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 - net5.0 + 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 335ada4075e..9974fa74f11 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} - net5.0 + 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 70f46081d14..9b4264ebadd 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 - net5.0 + 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 9ab5f77228d..47d08c7d01b 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj @@ -6,7 +6,7 @@ None - net5.0 + 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 447178fec88..687a2ce470f 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 - net5.0 + net6.0 false diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props index 1469bbb0e17..c956f4787f4 100644 --- a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props +++ b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props @@ -1,6 +1,6 @@ - net5.0 + net6.0 @@ -21,7 +21,7 @@ $(DefineConstants);NETCOREAPP3_0 $(DefineConstants);NETCOREAPP3_1 - $(DefineConstants);NETCOREAPP5_0 + $(DefineConstants);NETCOREAPP5_0