Skip to content

Commit 0aa98ff

Browse files
Removing redundant conditions
1 parent d368c8f commit 0aa98ff

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,21 @@
9191
.NET 4.5+: PresentationCore, PresentationFramework, WindowsBase, System.Xaml,
9292
UIAutomationClient, UIAutomationClientSideProviders, UIAutomationProvider, UIAutomationTypes
9393
System.Windows.Controls.Ribbon
94-
95-
Note:
96-
These are WPF specific version lower-bounds. Do not use $(_WindowsDesktopSdkTargetFrameworkVersionFloor) in place of '3.0' below.
94+
9795
-->
9896
<ItemGroup Condition="('$(TargetFrameworkIdentifier)' == '.NETFramework') And ('$(_TargetFrameworkVersionWithoutV)' != '') And
9997
('$(_TargetFrameworkVersionWithoutV)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
100-
<_WpfCommonNetFxReference Include="WindowsBase" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '3.0'" />
101-
<_WpfCommonNetFxReference Include="PresentationCore" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '3.0'" />
102-
<_WpfCommonNetFxReference Include="PresentationFramework" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '3.0'" />
98+
99+
<!--
100+
The following 3 _WpfCommonNetFxReference items normally require Condition="'$(_TargetFrameworkVersionWithoutV)' >= '3.0'", since
101+
they are supported on .NET Framework 3.0 and above.
102+
103+
This condition is implicitly satisfied by '$(_TargetFrameworkVersionWithoutV)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)'
104+
in the outer ItemGroup
105+
-->
106+
<_WpfCommonNetFxReference Include="WindowsBase" />
107+
<_WpfCommonNetFxReference Include="PresentationCore" />
108+
<_WpfCommonNetFxReference Include="PresentationFramework" />
103109

104110
<_WpfCommonNetFxReference Include="System.Xaml" Condition="'$(_TargetFrameworkVersionWithoutV)' >= '4.0'">
105111
<RequiredTargetFramework>4.0</RequiredTargetFramework>

0 commit comments

Comments
 (0)