From cf3b6f6a4172a265a360a755935733f13b44a718 Mon Sep 17 00:00:00 2001 From: Jeremy Kuhne Date: Tue, 8 Oct 2024 12:48:34 -0700 Subject: [PATCH 1/2] Remove NetCoreReference This removes the `NetCoreReference` infrastructure and replaces it with `DefaultReferenceExclusion` to remove the one problematic implicit reference to WindowsBase. Manually picking references was blocking using System.Private.Windows.Core from the WinForms repo. Not having this also greatly simplifies the projects. This also tweaks the solution to add folders docs and eng items. Fixes #9168 --- Documentation/LocalMarkupCompilation.md | 6 +- Microsoft.Dotnet.Wpf.sln | 72 ++++------- eng/WpfArcadeSdk/tools/Pbt.targets | 15 --- eng/WpfArcadeSdk/tools/SdkReferences.targets | 120 +++++------------- ...nFramework-PresentationUI-api-cycle.csproj | 7 - ...Framework-ReachFramework-impl-cycle.csproj | 24 ---- ...Framework-System.Printing-api-cycle.csproj | 24 ---- ...ramework-System.Printing-impl-cycle.csproj | 24 ---- ...UI-PresentationFramework-impl-cycle.csproj | 7 - ...ork-PresentationFramework-api-cycle.csproj | 6 - ...Framework-System.Printing-api-cycle.csproj | 6 - ...ing-PresentationFramework-api-cycle.csproj | 6 - .../PresentationFramework-SystemCore.csproj | 11 -- .../PresentationFramework-SystemData.csproj | 15 --- ...PresentationFramework-SystemDrawing.csproj | 14 -- .../PresentationFramework-SystemXml.csproj | 13 -- ...PresentationFramework-SystemXmlLinq.csproj | 12 -- .../PresentationCore/PresentationCore.csproj | 49 ------- .../ref/PresentationCore-ref.csproj | 42 ------ .../PresentationFramework.csproj | 58 --------- .../ref/PresentationFramework-ref.csproj | 55 -------- .../src/PresentationUI/PresentationUI.csproj | 36 +----- .../ref/PresentationUI-ref.csproj | 9 -- .../src/ReachFramework/ReachFramework.csproj | 34 ----- .../ref/ReachFramework-ref.csproj | 33 ----- .../ref/System.Printing-ref.csproj | 23 ---- .../System.Windows.Controls.Ribbon.csproj | 45 ------- .../System.Windows.Controls.Ribbon-ref.csproj | 42 ------ .../System.Windows.Input.Manipulations.csproj | 13 -- ...tem.Windows.Input.Manipulations-ref.csproj | 11 -- .../System.Windows.Presentation.csproj | 9 -- .../System.Windows.Presentation-ref.csproj | 10 +- .../src/System.Xaml/System.Xaml.csproj | 35 ----- .../System.Xaml/ref/System.Xaml-ref.csproj | 33 ----- .../PresentationFramework.Aero.csproj | 36 ------ .../ref/PresentationFramework.Aero-ref.csproj | 35 ----- .../PresentationFramework.Aero2.csproj | 36 ------ .../PresentationFramework.Aero2-ref.csproj | 37 +----- .../PresentationFramework.AeroLite.csproj | 36 ------ .../PresentationFramework.AeroLite-ref.csproj | 35 ----- .../PresentationFramework.Classic.csproj | 37 ------ .../PresentationFramework.Classic-ref.csproj | 37 +----- .../PresentationFramework.Fluent.csproj | 37 +----- .../PresentationFramework.Fluent-ref.csproj | 35 ----- .../PresentationFramework.Luna.csproj | 37 ------ .../ref/PresentationFramework.Luna-ref.csproj | 37 +----- .../PresentationFramework.Royale.csproj | 37 ------ .../PresentationFramework.Royale-ref.csproj | 37 +----- .../UIAutomationClient.csproj | 19 --- .../ref/UIAutomationClient-ref.csproj | 17 --- .../UIAutomationClientSideProviders.csproj | 19 --- ...UIAutomationClientSideProviders-ref.csproj | 19 +-- .../UIAutomationProvider.csproj | 17 --- .../ref/UIAutomationProvider-ref.csproj | 17 --- .../UIAutomationTypes.csproj | 17 --- .../ref/UIAutomationTypes-ref.csproj | 12 -- .../src/WindowsBase/WindowsBase.csproj | 41 ------ .../WindowsBase/ref/WindowsBase-ref.csproj | 39 ------ .../WindowsFormsIntegration.csproj | 19 --- .../ref/WindowsFormsIntegration-ref.csproj | 19 --- .../BamlTestClasses40.csproj | 67 +--------- 61 files changed, 68 insertions(+), 1682 deletions(-) diff --git a/Documentation/LocalMarkupCompilation.md b/Documentation/LocalMarkupCompilation.md index ccaa03ae3a4..1e6b1e7d17d 100644 --- a/Documentation/LocalMarkupCompilation.md +++ b/Documentation/LocalMarkupCompilation.md @@ -37,8 +37,4 @@ It can be enabled for a project by setting this: In addition to these, care must be taken for the following: - Use `` instead of `` - - `PresentationBuildTask` will strip out `` items during `_CompileTemporaryAssembly` phase. Using `EmbeddedResource` is equivalent (esp. in for `Xlf` based string resource generation with `Arcade.Sdk`) and will not be adversely affected by `PresentationBuildTasks` transformations. -- Always use `` instead of implicitly acquiring the full set of `Microsoft.NetCore.App` references. - - `Microsoft.NetCore.App` contains a version `WindowsBase` that clashes with WPF's `WindowsBase` during markup compilation. - - To avoid this clash, we must always specify the references we need explicitly. - - Also, our code-base requires that all references be specified explicitly anyway to avoid inadvertent reference-creep to bug-fixes. \ No newline at end of file + - `PresentationBuildTask` will strip out `` items during `_CompileTemporaryAssembly` phase. Using `EmbeddedResource` is equivalent (esp. in for `Xlf` based string resource generation with `Arcade.Sdk`) and will not be adversely affected by `PresentationBuildTasks` transformations. diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln index aaf3a7929fa..8eeb0a72bed 100644 --- a/Microsoft.Dotnet.Wpf.sln +++ b/Microsoft.Dotnet.Wpf.sln @@ -239,21 +239,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OSVersionHelper", "src\Micr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresentationNative", "src\Microsoft.DotNet.Wpf\redist\PresentationNative\PresentationNative.vcxproj", "{AF9084C3-BF37-4A56-A851-89F3BAE731B3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3F4DFE8-A29C-4BA1-964D-954AB6732744}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf", "Microsoft.DotNet.Wpf", "{C9ECC1A1-917F-43D3-B340-2035B4938507}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{34B64A4A-7C83-4F92-8C47-80E9FA10D660}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{A48B585E-6AB0-4F8D-8484-77F37CB44437}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Xaml.Tests\System.Xaml.Tests.csproj", "{B2F2A89C-55C9-41B1-A645-0948609BD8BE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.Fluent", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.Fluent\PresentationFramework.Fluent.csproj", "{3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.Fluent-ref", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.Fluent\ref\PresentationFramework.Fluent-ref.csproj", "{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\PresentationCore.Tests\PresentationCore.Tests.csproj", "{A4377D3F-6BA1-4994-945C-88667993E4F3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{92968783-2008-4A16-A823-6737224FEB9E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{B90B3D18-1B80-4FAF-A8DF-146C4F930AF9}" + ProjectSection(SolutionItems) = preProject + Documentation\acceptance_criteria.md = Documentation\acceptance_criteria.md + Documentation\api-compat.md = Documentation\api-compat.md + Documentation\C++-notes.md = Documentation\C++-notes.md + Documentation\c++-private-tools.md = Documentation\c++-private-tools.md + Documentation\codegen.md = Documentation\codegen.md + Documentation\contributing.md = Documentation\contributing.md + Documentation\cycle-breakers.md = Documentation\cycle-breakers.md + Documentation\developer-guide.md = Documentation\developer-guide.md + Documentation\gen-api.md = Documentation\gen-api.md + Documentation\getting-started.md = Documentation\getting-started.md + Documentation\issue-guide.md = Documentation\issue-guide.md + Documentation\localization_untranslated_strings.md = Documentation\localization_untranslated_strings.md + Documentation\LocalMarkupCompilation.md = Documentation\LocalMarkupCompilation.md + Documentation\packaging.md = Documentation\packaging.md + Documentation\projects-and-assemblies.md = Documentation\projects-and-assemblies.md + Documentation\redistributables.md = Documentation\redistributables.md + Documentation\report-on-adding-new-property.md = Documentation\report-on-adding-new-property.md + Documentation\solution-and-project-configurations.md = Documentation\solution-and-project-configurations.md + Documentation\testing-in-helix.md = Documentation\testing-in-helix.md + Documentation\wpf.vsconfig = Documentation\wpf.vsconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1926,22 +1942,6 @@ Global {AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.ActiveCfg = Release|Win32 {AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.Build.0 = Release|Win32 {AF9084C3-BF37-4A56-A851-89F3BAE731B3}.Release|x86.Deploy.0 = Release|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|ARM64.Build.0 = Debug|ARM64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.ActiveCfg = Debug|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Build.0 = Debug|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|x86 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|x86 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Build.0 = Release|Any CPU - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|ARM64.ActiveCfg = Release|ARM64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|ARM64.Build.0 = Release|ARM64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.ActiveCfg = Release|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Build.0 = Release|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|x86 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|x86 {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|ARM64.ActiveCfg = Debug|arm64 @@ -1974,22 +1974,6 @@ Global {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x64.Build.0 = Release|x64 {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.ActiveCfg = Release|Any CPU {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.Build.0 = Release|Any CPU - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|ARM64.Build.0 = Debug|ARM64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x64.ActiveCfg = Debug|x64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x64.Build.0 = Debug|x64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x86.ActiveCfg = Debug|x86 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Debug|x86.Build.0 = Debug|x86 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|Any CPU.Build.0 = Release|Any CPU - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|ARM64.ActiveCfg = Release|ARM64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|ARM64.Build.0 = Release|ARM64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x64.ActiveCfg = Release|x64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x64.Build.0 = Release|x64 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x86.ActiveCfg = Release|x86 - {A4377D3F-6BA1-4994-945C-88667993E4F3}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2106,13 +2090,9 @@ Global {7EE0E965-7DA4-4A94-9441-801E8D2CC1CD} = {4557C5C6-10B1-475C-8279-5511955D1C29} {3801B5AE-6871-4A72-B400-1F6ABCBF9045} = {7EE0E965-7DA4-4A94-9441-801E8D2CC1CD} {AF9084C3-BF37-4A56-A851-89F3BAE731B3} = {DDED00A7-24FD-4AEF-B264-2150F0E59B4D} - {C9ECC1A1-917F-43D3-B340-2035B4938507} = {F3F4DFE8-A29C-4BA1-964D-954AB6732744} - {34B64A4A-7C83-4F92-8C47-80E9FA10D660} = {C9ECC1A1-917F-43D3-B340-2035B4938507} - {A48B585E-6AB0-4F8D-8484-77F37CB44437} = {34B64A4A-7C83-4F92-8C47-80E9FA10D660} - {B2F2A89C-55C9-41B1-A645-0948609BD8BE} = {A48B585E-6AB0-4F8D-8484-77F37CB44437} + {A48B585E-6AB0-4F8D-8484-77F37CB44437} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF} {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9} = {5ACFB055-649D-4A01-98C2-B0BFE7E543D6} {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD} = {60F4058B-D35B-42D2-B276-D44B3AC579BD} - {A4377D3F-6BA1-4994-945C-88667993E4F3} = {A48B585E-6AB0-4F8D-8484-77F37CB44437} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567} diff --git a/eng/WpfArcadeSdk/tools/Pbt.targets b/eng/WpfArcadeSdk/tools/Pbt.targets index 148ba687350..f6eae8b9b00 100644 --- a/eng/WpfArcadeSdk/tools/Pbt.targets +++ b/eng/WpfArcadeSdk/tools/Pbt.targets @@ -26,21 +26,6 @@ --> false - - - - - - - diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index 81f70261a06..c46449a3088 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -4,23 +4,14 @@ Version="$(MicrosoftPrivateWinformsVersion)" ExcludeAssets="All" GeneratePathProperty="True" - Condition="'$(MSBuildProjectExtension)'!='.vcxproj' + Condition="'$(MSBuildProjectExtension)' != '.vcxproj' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0')) - And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/> - - - + And '$(NoAutoMicrosoftPrivateWinformsReference)' != 'true'"/> + Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> - - - - - - - <_netCoreAppSdkReference Remove="@(_netCoreAppSdkReference)" /> - <_netCoreAppSdkReference Include="@(Reference)" - Condition="'%(Reference.NuGetPackageId)'=='Microsoft.NETCore.App.Ref'"> - %(Reference.Identity) - - - - - - - <_netCoreAppReferences Remove="@(_netCoreAppReferences)" /> - - - - - - - - - - - - - - - - <_windowsDesktopAppSdkReference Remove="@(_windowsDesktopAppSdkReference)" /> - <_windowsDesktopAppSdkReference Include="@(Reference)" - Condition="'%(Reference.NuGetPackageId)'=='Microsoft.WindowsDesktop.App.Ref'"> - %(Reference.Identity) - - - - - - - <_windowsDesktopAppReferences Remove="@(_windowsDesktopAppReferences)" /> - - - - - - - - - - + + + + + + + + + + <_referenceExclusion Include="@(DefaultReferenceExclusion)"> + %(DefaultReferenceExclusion.Identity) + Microsoft.NETCore.App + true + + + + + 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 d26a26e537c..037cd2025fb 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,6 @@ - false @@ -18,10 +17,4 @@ - - - - - - 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 176aca96319..58ff3e966ad 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,6 @@ - false @@ -21,29 +20,6 @@ - - - - - - - - - - - - - - - - - - - - - - - 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 1226d24239f..a64598e4202 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,6 @@ - false @@ -26,29 +25,6 @@ - - - - - - - - - - - - - - - - - - - - - - - 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 c2534c257ca..f0b7956f74c 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,6 @@ - false @@ -21,29 +20,6 @@ - - - - - - - - - - - - - - - - - - - - - - - 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 ac606a09bf0..74613edd068 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,6 @@ - false @@ -22,12 +21,6 @@ - - - - - - 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 5cf0917e505..f993874c594 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,6 @@ - false @@ -19,9 +18,4 @@ - - - - - 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 a8d11bbb7b6..9d7e5cec656 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,6 @@ - false @@ -24,9 +23,4 @@ - - - - - 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 ba0d0ce4a0e..959d9a8546e 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,6 @@ - false @@ -18,9 +17,4 @@ - - - - - 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 f747018d745..747caeb0aff 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,5 @@  - AnyCPU;x64;arm64 false false @@ -13,14 +12,4 @@ - - - - - - - - - - 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 36dfefa35f2..5392a908fd8 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,5 @@  - AnyCPU;x64;arm64 false false @@ -12,18 +11,4 @@ - - - - - - - - - - - - - - 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 596b7c8cf34..f519255f4fa 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,5 @@  - AnyCPU;x64;arm64 false false @@ -13,19 +12,6 @@ - - - - - - - - - - - - - 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 089592777c0..df5cf665a47 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,5 @@  - AnyCPU;x64;arm64 false false @@ -14,16 +13,4 @@ - - - - - - - - - - - - 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 c96df287a7a..4ca353d3bf1 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,5 @@  - AnyCPU;x64;arm64 false false @@ -12,15 +11,4 @@ - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 969939d42dc..fb096866817 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -13,7 +13,6 @@ - false @@ -1419,54 +1418,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 75d9e1c713d..c6b81d08c8c 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,6 @@ MS.Internal.PresentationCore None AnyCPU;x64;arm64 - @@ -20,47 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index 28168bbd37b..ea54f916473 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -1372,64 +1372,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 b7ea8c46323..c16bc64ca63 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,6 @@ None AnyCPU;x64;arm64 false - @@ -23,60 +22,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index b9c330c9403..9ae18ce2d19 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -1,8 +1,6 @@  - - AnyCPU;x64;arm64 false @@ -15,6 +13,7 @@ true true false + true @@ -221,40 +220,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 2d1155868d4..2558c996b26 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,6 @@ PresentationUI PresentationUI-ref $(TargetGroup)-$(PackageId)/ - AnyCPU;x64;arm64 false @@ -13,14 +12,6 @@ - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj index 63e47149de3..9589bff0c10 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj @@ -10,7 +10,6 @@ - false @@ -335,39 +334,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 f6576bea982..9bfff75f9f9 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ref/ReachFramework-ref.csproj @@ -10,44 +10,11 @@ None AnyCPU;x64;arm64 false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 c2776b69197..b53a4c5292a 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,6 @@ - false @@ -20,28 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - 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 fc4369d6723..8e4b96e004f 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 @@ -1,8 +1,6 @@  - - AnyCPU;x64;arm64 false $(DefineConstants);RIBBON_IN_FRAMEWORK @@ -13,7 +11,6 @@ true true false - @@ -183,47 +180,5 @@ false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 7658475e774..10147e17fd6 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,6 @@ System.Windows.Controls.Ribbon System.Windows.Controls.Ribbon-ref $(TargetGroup)-$(PackageId)/ - AnyCPU;x64;arm64 $(DefineConstants);RIBBON_IN_FRAMEWORK $(NoWarn);0618 @@ -32,45 +31,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 f7fc1f1a610..577c18f3117 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,5 @@  - false AnyCPU;x64;arm64 @@ -36,21 +35,9 @@ - - - - - - - - - - - false - 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 eb5f4bded3d..e375c4a45be 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,21 +3,10 @@ System.Windows.Input.Manipulations System.Windows.Input.Manipulations-ref $(TargetGroup)-$(PackageId)/ - 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 034e6298919..73ac63ff44b 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,5 @@  - AnyCPU;x64;arm64 false false @@ -10,14 +9,6 @@ - - - - - - - - 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 b95c28362f9..9fd6b15cfea 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)/ - + AnyCPU;x64;arm64 false @@ -12,14 +12,6 @@ - - - - - - - - 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 24a8ae2478f..3c7e3d306cd 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -80,41 +80,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 7498f329404..9ec85acb1c6 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 @@ -15,39 +15,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 b7aacf881e1..1280346ccae 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 @@ -2,8 +2,6 @@ - - None AnyCPU;x64;arm64 false @@ -51,38 +49,4 @@ 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 306a127437c..23a628c13af 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 @@ -28,39 +28,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 4964d7d6f99..8ff7a7b2481 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 @@ -2,8 +2,6 @@ - - None AnyCPU;x64;arm64 false @@ -51,38 +49,4 @@ 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 e11743b5c28..3a0c3e4dea2 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)/ - + None AnyCPU;x64;arm64 false @@ -28,39 +28,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 f5756f96944..28a57d42619 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 @@ -2,8 +2,6 @@ - - None AnyCPU;x64;arm64 false @@ -48,38 +46,4 @@ 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 58e037c7686..4ecf40af394 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 @@ -27,39 +27,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 5c3caa12da4..635e0b82b47 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 @@ -2,8 +2,6 @@ - - None AnyCPU;x64;arm64 false @@ -18,7 +16,6 @@ true true false - @@ -48,38 +45,4 @@ 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 4b2bf52b9dc..6a289c87109 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)/ - + None AnyCPU;x64;arm64 false @@ -27,39 +27,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/PresentationFramework.Fluent.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/PresentationFramework.Fluent.csproj index a07083187f7..44e64be5a3c 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/PresentationFramework.Fluent.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/PresentationFramework.Fluent.csproj @@ -1,6 +1,5 @@ - + - None AnyCPU;x64;arm64 @@ -41,43 +40,9 @@ false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/ref/PresentationFramework.Fluent-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/ref/PresentationFramework.Fluent-ref.csproj index 215a7d21892..a56e8542435 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/ref/PresentationFramework.Fluent-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/ref/PresentationFramework.Fluent-ref.csproj @@ -28,39 +28,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 98d7ffc9426..4b8da915fad 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 @@ -1,9 +1,6 @@  - - - None AnyCPU;x64;arm64 false @@ -56,38 +53,4 @@ 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 97c2317f4f0..232d6530af1 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)/ - + None AnyCPU;x64;arm64 false @@ -27,39 +27,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 7a67eab4d74..82343774b52 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 @@ -1,9 +1,6 @@  - - - None AnyCPU;x64;arm64 false @@ -50,38 +47,4 @@ 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 aa15395e27a..6356e58ed99 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)/ - + None AnyCPU;x64;arm64 false @@ -27,39 +27,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj index e640afd9283..424687b3382 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj @@ -7,7 +7,6 @@ $(NoWarn);0618;CA1821 - false false @@ -103,24 +102,6 @@ - - - - - - - - - - - - - - - - - - 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 51b713c08b9..37c3a3f14f3 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 @@ -21,23 +21,6 @@ - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj index 83473c0a568..949714861d4 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj @@ -7,7 +7,6 @@ true - false false @@ -112,24 +111,6 @@ - - - - - - - - - - - - - - - - - - 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 1e9ad448090..5a99120e583 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 - + false @@ -22,23 +22,6 @@ - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj index bd0c444e488..7e1d72ce524 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj @@ -7,7 +7,6 @@ - false @@ -47,22 +46,6 @@ - - - - - - - - - - - - - - - - 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 95c5a0f9700..66b173133b9 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 @@ -7,28 +7,11 @@ $(DefineConstants);AUTOMATION false AnyCPU;x64;arm64 - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj index 6177a0cc772..6758653dfee 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj @@ -9,7 +9,6 @@ - false @@ -89,22 +88,6 @@ - - - - - - - - - - - - - - - - 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 7450967b812..6648447940b 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,6 @@ $(DefineConstants);UIAUTOMATIONTYPES $(NoWarn);0618 false - AnyCPU;x64;arm64 @@ -20,17 +19,6 @@ - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj index 3e3a3ca55eb..1220c0106a0 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj @@ -7,7 +7,6 @@ $(NoWarn);0618 false {FA69991B-9696-42D0-A5C7-F5E73F0DEE9E} - AnyCPU;x64;arm64 @@ -371,46 +370,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 e66a81113be..4850165e188 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj @@ -18,45 +18,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj index f8a6ad01de7..37c179d0de0 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj @@ -6,7 +6,6 @@ None - false false @@ -54,24 +53,6 @@ - - - - - - - - - - - - - - - - - - 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 98981da49c9..31854725e2c 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,6 @@ $(DefineConstants);WINDOWSFORMSINTEGRATION $(NoWarn);0618 None - false @@ -20,27 +19,9 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.Wpf/tests/IntegrationTests/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj b/src/Microsoft.DotNet.Wpf/tests/IntegrationTests/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj index 0e30082135c..981e1d99ede 100644 --- a/src/Microsoft.DotNet.Wpf/tests/IntegrationTests/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj +++ b/src/Microsoft.DotNet.Wpf/tests/IntegrationTests/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj @@ -9,7 +9,7 @@ true TRACE - true @@ -71,69 +71,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From a8604488b31e2e3a1b0386aefdf06a142b2a2dde Mon Sep 17 00:00:00 2001 From: Jeremy Kuhne Date: Tue, 8 Oct 2024 17:40:47 -0700 Subject: [PATCH 2/2] Put back test projects in solution --- Microsoft.Dotnet.Wpf.sln | 45 +++++++++++++++++++ eng/WpfArcadeSdk/tools/SdkReferences.targets | 6 +-- .../src/PresentationUI/PresentationUI.csproj | 1 - 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln index 8eeb0a72bed..03db64d55f6 100644 --- a/Microsoft.Dotnet.Wpf.sln +++ b/Microsoft.Dotnet.Wpf.sln @@ -246,6 +246,13 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.Fluent-ref", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.Fluent\ref\PresentationFramework.Fluent-ref.csproj", "{3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{92968783-2008-4A16-A823-6737224FEB9E}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + eng\WpfArcadeSdk\Sdk\Sdk.props = eng\WpfArcadeSdk\Sdk\Sdk.props + eng\WpfArcadeSdk\Sdk\Sdk.targets = eng\WpfArcadeSdk\Sdk\Sdk.targets + eng\WpfArcadeSdk\tools\SdkReferences.targets = eng\WpfArcadeSdk\tools\SdkReferences.targets + eng\Versions.props = eng\Versions.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{B90B3D18-1B80-4FAF-A8DF-146C4F930AF9}" ProjectSection(SolutionItems) = preProject @@ -271,6 +278,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat Documentation\wpf.vsconfig = Documentation\wpf.vsconfig EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationCore.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\PresentationCore.Tests\PresentationCore.Tests.csproj", "{398CD1C6-A92E-4B63-97CD-4CABD96FA868}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xaml.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Xaml.Tests\System.Xaml.Tests.csproj", "{93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1974,6 +1985,38 @@ Global {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x64.Build.0 = Release|x64 {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.ActiveCfg = Release|Any CPU {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD}.Release|x86.Build.0 = Release|Any CPU + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|Any CPU.Build.0 = Debug|Any CPU + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|ARM64.Build.0 = Debug|ARM64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|x64.ActiveCfg = Debug|x64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|x64.Build.0 = Debug|x64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|x86.ActiveCfg = Debug|x86 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Debug|x86.Build.0 = Debug|x86 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|Any CPU.ActiveCfg = Release|Any CPU + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|Any CPU.Build.0 = Release|Any CPU + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|ARM64.ActiveCfg = Release|ARM64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|ARM64.Build.0 = Release|ARM64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|x64.ActiveCfg = Release|x64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|x64.Build.0 = Release|x64 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|x86.ActiveCfg = Release|x86 + {398CD1C6-A92E-4B63-97CD-4CABD96FA868}.Release|x86.Build.0 = Release|x86 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|ARM64.Build.0 = Debug|ARM64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|x64.ActiveCfg = Debug|x64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|x64.Build.0 = Debug|x64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|x86.ActiveCfg = Debug|x86 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Debug|x86.Build.0 = Debug|x86 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|Any CPU.Build.0 = Release|Any CPU + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|ARM64.ActiveCfg = Release|ARM64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|ARM64.Build.0 = Release|ARM64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|x64.ActiveCfg = Release|x64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|x64.Build.0 = Release|x64 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|x86.ActiveCfg = Release|x86 + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2093,6 +2136,8 @@ Global {A48B585E-6AB0-4F8D-8484-77F37CB44437} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF} {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9} = {5ACFB055-649D-4A01-98C2-B0BFE7E543D6} {3C43C553-2C1F-4EB9-8BF8-371D4A42E0FD} = {60F4058B-D35B-42D2-B276-D44B3AC579BD} + {398CD1C6-A92E-4B63-97CD-4CABD96FA868} = {A48B585E-6AB0-4F8D-8484-77F37CB44437} + {93C6A5C8-4545-49DD-8D48-DDD6665ADFC0} = {A48B585E-6AB0-4F8D-8484-77F37CB44437} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567} diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index c46449a3088..9e2d201864c 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -135,9 +135,9 @@ Allows excluding specific .NET runtime libraries from being implicitly referenced. For example, to exclude WindowsBase from being implicitly referenced, add the following to your project file: - - - + + + --> true true false - true