Fix WindowsDesktop file list root attributes (dotnet/core-setup#5533)

Stop automatically inheriting the .NET Core targeting pack's values. Commit migrated from dotnet/core-setup@42bdab6
shangte · Mar 22, 2019 · d0c2cc0 · d0c2cc0
1 parent ff448dd
commit d0c2cc0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/src/installer/pkg/projects/dir.props b/src/installer/pkg/projects/dir.props
@@ -30,13 +30,6 @@
     <ProjectExclusions Include="windowsdesktop\**\*.*proj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkListRootAttributes Include="Name" Value="$(NETCoreAppFrameworkBrandName)" />
-    <FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(NETCoreAppFrameworkIdentifier)" />
-    <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(NETCoreAppFrameworkVersion)" />
-    <FrameworkListRootAttributes Include="FrameworkName" Value="$(SharedFrameworkName)" />
-  </ItemGroup>
-
   <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
     <SkipValidatePackage>true</SkipValidatePackage>
     <IncludeRuntimeJson>true</IncludeRuntimeJson>

diff --git a/src/installer/pkg/projects/dir.targets b/src/installer/pkg/projects/dir.targets
@@ -193,6 +193,17 @@
       <FrameworkListFile>$(IntermediateOutputPath)FrameworkList.xml</FrameworkListFile>
     </PropertyGroup>
 
+    <ItemGroup>
+      <FrameworkListRootAttributes Include="Name" Value="$(FrameworkListName)" />
+      <FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(FrameworkListTargetFrameworkIdentifier)" />
+      <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(FrameworkListTargetFrameworkVersion)" />
+      <FrameworkListRootAttributes Include="FrameworkName" Value="$(FrameworkListFrameworkName)" />
+    </ItemGroup>
+
+    <Error
+      Condition="'%(FrameworkListRootAttributes.Value)' == ''"
+      Text="Missing value for property 'FrameworkList%(FrameworkListRootAttributes.Identity)'" />
+
     <CreateFrameworkListFile
       Files="@(File)"
       TargetFile="$(FrameworkListFile)"

diff --git a/src/installer/pkg/projects/netcoreapp/pkg/dir.props b/src/installer/pkg/projects/netcoreapp/pkg/dir.props
@@ -7,6 +7,13 @@
 
   <Import Project="..\..\dir.props" />
 
+  <PropertyGroup>
+    <FrameworkListName>$(NETCoreAppFrameworkBrandName)</FrameworkListName>
+    <FrameworkListTargetFrameworkIdentifier>$(NETCoreAppFrameworkIdentifier)</FrameworkListTargetFrameworkIdentifier>
+    <FrameworkListTargetFrameworkVersion>$(NETCoreAppFrameworkVersion)</FrameworkListTargetFrameworkVersion>
+    <FrameworkListFrameworkName>$(SharedFrameworkName)</FrameworkListFrameworkName>
+  </PropertyGroup>
+
   <!-- Redistribute package content from other nuget packages. -->
   <ItemGroup>
     <ProjectReference Include="..\src\netcoreapp.depproj">

diff --git a/src/installer/pkg/projects/windowsdesktop/dir.props b/src/installer/pkg/projects/windowsdesktop/dir.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., dir.props))\dir.props" />
+
+  <PropertyGroup>
+    <FrameworkPackageName>Microsoft.WindowsDesktop.App</FrameworkPackageName>
+  </PropertyGroup>
+</Project>
diff --git a/src/installer/pkg/projects/windowsdesktop/pkg/dir.props b/src/installer/pkg/projects/windowsdesktop/pkg/dir.props
@@ -6,7 +6,14 @@
     <ProductBrandPrefix>Microsoft Windows Desktop</ProductBrandPrefix>
   </PropertyGroup>
 
-  <Import Project="..\..\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., dir.props))\dir.props" />
+
+  <PropertyGroup>
+    <FrameworkListName>Windows Desktop $(NETCoreAppFrameworkVersion)</FrameworkListName>
+    <FrameworkListTargetFrameworkIdentifier>$(NETCoreAppFrameworkIdentifier)</FrameworkListTargetFrameworkIdentifier>
+    <FrameworkListTargetFrameworkVersion>$(NETCoreAppFrameworkVersion)</FrameworkListTargetFrameworkVersion>
+    <FrameworkListFrameworkName>$(FrameworkPackageName)</FrameworkListFrameworkName>
+  </PropertyGroup>
 
   <PropertyGroup>
     <BuildDebPackage>false</BuildDebPackage>

diff --git a/src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj b/src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj
@@ -2,10 +2,6 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
-  <PropertyGroup>
-    <FrameworkPackageName>Microsoft.WindowsDesktop.App</FrameworkPackageName>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsDesktop.App">
       <Version>$(MicrosoftWindowsDesktopAppPackageVersion)</Version>