Define _WindowsDesktopTargetFrameworkVersion as an Item to ensure it is evaluated after properties (like _TargetFrameworkVersionWithoutV) are defined

Author: vatsan-madhavan

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

@@ -1,13 +1,20 @@
 <Project>
   <PropertyGroup>
     <_MicrosoftNetSdkWindowsDesktop>true</_MicrosoftNetSdkWindowsDesktop>
-
-    <_InvalidTargetFrameworkVersion>0.0</_InvalidTargetFrameworkVersion>
-    <_TargetFrameworkVersionValue Condition="'$(_TargetFrameworkVersionValue)' == ''">$([MSBuild]::ValueOrDefault($(_TargetFrameworkVersionWithoutV), $(_InvalidTargetFrameworkVersion)))</_TargetFrameworkVersionValue>
-    
+   
     <EnableDefaultPageItems Condition="'$(EnableDefaultPageItems)' == ''">true</EnableDefaultPageItems> 
     <EnableDefaultApplicationDefinition Condition="'$(EnableDefaultApplicationDefinition)' == ''">true</EnableDefaultApplicationDefinition>
   </PropertyGroup>
+  
+  <PropertyGroup>
+    <_InvalidTargetFrameworkVersion>0.0</_InvalidTargetFrameworkVersion>  
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <_WindowsDesktopTargetFrameworkVersion Remove="@(_WindowsDesktopTargetFrameworkVersion)" />
+    <_WindowsDesktopTargetFrameworkVersion Include="$([MSBuild]::ValueOrDefault($(_TargetFrameworkVersionWithoutV), $(_InvalidTargetFrameworkVersion)))" />
+  </ItemGroup>
+
 
   <PropertyGroup>
     <!-- 
@@ -19,19 +26,19 @@
     using the SDK style projects. For e.g., see https://github.com/microsoft/msbuild/issues/1333
     
     Irrespective of whether '$(TargetFrameworkIdentifier)' is '.NETCoreApp' or '.NETFramework', 
-    the minimum value of $(_TargetFrameworkVersionValue) we will be testing for is '3.0'
+    the minimum value of @(_WindowsDesktopTargetFrameworkVersion) we will be testing for is '3.0'
     
     Note:
       Please see https://github.com/microsoft/msbuild/issues/3212 for a discussion about the use of 
       the private $(_TargetFrameworkVersionWithoutV) property - which will likely remain supported and
-      is safe to use here. This is used to in turn define $(_TargetFrameworkVersionValue).
+      is safe to use here. This is used to in turn define @(_WindowsDesktopTargetFrameworkVersion).
   -->
     <_WindowsDesktopSdkTargetFrameworkVersionFloor>3.0</_WindowsDesktopSdkTargetFrameworkVersionFloor>
   </PropertyGroup>
 
   <ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And 
-                         ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                         ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                         ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                         ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
     <ApplicationDefinition Include="App.xaml"
                            Condition="'$(EnableDefaultApplicationDefinition)' != 'false' And Exists('$(MSBuildProjectDirectory)/App.xaml') And '$(MSBuildProjectExtension)' == '.csproj'">
       <Generator>MSBuild:Compile</Generator>
@@ -65,8 +72,8 @@
 
   <ItemGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And
                       ('$(TargetFrameworkIdentifier)' == '.NETCoreApp') And
-                      ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And
-                      ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                      ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And
+                      ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
     <FrameworkReference Include="Microsoft.WindowsDesktop.App" IsImplicitlyDefined="true"
                         Condition="('$(UseWPF)' == 'true') And ('$(UseWindowsForms)' == 'true')"/>
@@ -101,35 +108,35 @@
 
   -->
   <ItemGroup Condition="('$(TargetFrameworkIdentifier)' == '.NETFramework') And 
-                        ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                        ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                        ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                        ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
     <!--
-      The following 3 _WpfCommonNetFxReference items normally require Condition="'$(_TargetFrameworkVersionValue)' >= '3.0'", since
+      The following 3 _WpfCommonNetFxReference items normally require Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '3.0'", since
       they are supported on .NET Framework 3.0 and above. 
       
-      This condition is implicitly satisfied by '$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)' 
+      This condition is implicitly satisfied by '@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)' 
       in the outer ItemGroup
     -->
     <_WpfCommonNetFxReference Include="WindowsBase" /> 
     <_WpfCommonNetFxReference Include="PresentationCore" />
     <_WpfCommonNetFxReference Include="PresentationFramework" />
 
-    <_WpfCommonNetFxReference Include="System.Xaml" Condition="'$(_TargetFrameworkVersionValue)' >= '4.0'">
+    <_WpfCommonNetFxReference Include="System.Xaml" Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '4.0'">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </_WpfCommonNetFxReference>
-    <_WpfCommonNetFxReference Include="UIAutomationClient" Condition="'$(_TargetFrameworkVersionValue)' >= '4.0'" />
-    <_WpfCommonNetFxReference Include="UIAutomationClientSideProviders" Condition="'$(_TargetFrameworkVersionValue)' >= '4.0'" />
-    <_WpfCommonNetFxReference Include="UIAutomationProvider" Condition="'$(_TargetFrameworkVersionValue)' >= '4.0'" />
-    <_WpfCommonNetFxReference Include="UIAutomationTypes" Condition="'$(_TargetFrameworkVersionValue)' >= '4.0'" />
+    <_WpfCommonNetFxReference Include="UIAutomationClient" Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '4.0'" />
+    <_WpfCommonNetFxReference Include="UIAutomationClientSideProviders" Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '4.0'" />
+    <_WpfCommonNetFxReference Include="UIAutomationProvider" Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '4.0'" />
+    <_WpfCommonNetFxReference Include="UIAutomationTypes" Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '4.0'" />
 
-    <_WpfCommonNetFxReference Include="System.Windows.Controls.Ribbon" Condition="'$(_TargetFrameworkVersionValue)' >= '4.5'" />
+    <_WpfCommonNetFxReference Include="System.Windows.Controls.Ribbon" Condition="'@(_WindowsDesktopTargetFrameworkVersion)' >= '4.5'" />
   </ItemGroup>
 
   <ItemGroup Condition="('$(DisableImplicitFrameworkReferences)' != 'true') And 
                         ('$(TargetFrameworkIdentifier)' == '.NETFramework') And 
-                        ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                        ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                        ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                        ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
     <_SDKImplicitReference Include="@(_WpfCommonNetFxReference)"
                        Condition="'$(UseWPF)' == 'true'"/>
@@ -161,8 +168,8 @@
     Detect these situations and skip updates to @(SupportedTargetFramework) etc. 
   --> 
   <ItemGroup Condition="('$(UseWPF)' == 'true' Or '$(UseWindowsForms)' == 'true') And 
-                        ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                        ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                        ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                        ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
     <!-- 
         Windows Forms and WPF are supported only on .NET Core 3.0+

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

@@ -2,8 +2,8 @@
   <Import Project="Microsoft.WinFX.targets" />
 
   <ItemGroup Condition=" ('$(EnableDefaultItems)' == 'true') And ('$(UseWPF)' == 'true') And 
-                         ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                         ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                         ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                         ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
     <!-- In the WindowsDesktop .props, we globbed all .xaml files as Page items.  If any of those files are included
          as Resource, Content, or None items, then remove them from the Page items. -->
@@ -18,8 +18,8 @@
           BeforeTargets="_CheckForInvalidConfigurationAndPlatform;CoreCompile"
           DependsOnTargets="CheckForDuplicateItems"
           Condition="('$(UseWPF)' == 'true') And 
-                     ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                     ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                     ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                     ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
 
     <CheckForDuplicateItems
       Items="@(Page)"
@@ -47,8 +47,8 @@
   --> 
   <Target Name="_WindowsDesktopFrameworkRequiresUseWpfOrUseWindowsForms"
           BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
-          Condition="('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                     ('$(_TargetFrameworkVersionValue)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+          Condition="('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                     ('@(_WindowsDesktopTargetFrameworkVersion)' >= '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
     <NetSdkWarning ResourceName="WindowsDesktopFrameworkRequiresUseWpfOrUseWindowsForms" 
                    Condition="'$(UseWpf)' != 'true' And '$(UseWindowsForms)' != 'true'"/>
   </Target>
@@ -62,8 +62,8 @@
   <Target Name="_WindowsDesktopFrameworkRequiresVersion30"
         BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
         Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp') And 
-                   ('$(_TargetFrameworkVersionValue)' != '$(_InvalidTargetFrameworkVersion)') And 
-                   ('$(_TargetFrameworkVersionValue)' &lt; '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
+                   ('@(_WindowsDesktopTargetFrameworkVersion)' != '$(_InvalidTargetFrameworkVersion)') And 
+                   ('@(_WindowsDesktopTargetFrameworkVersion)' &lt; '$(_WindowsDesktopSdkTargetFrameworkVersionFloor)')">
     <NetSdkWarning ResourceName="WindowsDesktopFrameworkRequiresVersion30" />
   </Target>
 </Project>