Fix Profiles Attributes for Ref/Runtime Pack (#4788)

* fix profiles * update comment
dotnet · Nov 22, 2024 · d212e0b · d212e0b
1 parent 23fe0c4
commit d212e0b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/src/windowsdesktop/src/sfx/Directory.Build.props b/src/windowsdesktop/src/sfx/Directory.Build.props
@@ -37,6 +37,11 @@
     <PackageReference Include="Microsoft.Internal.Runtime.WindowsDesktop.Transport" />
   </ItemGroup>
 
+  <!-- Profile is intentionally undefined so that the reference will only be included when no profile is specified i.e. both WPF and WindowsForms are in use https://github.com/dotnet/wpf/blob/bbfc24fd13804a191e20064acd599b0a359092df/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props#L45-L46 -->
+  <ItemGroup>
+    <FrameworkListFileClass Include="WindowsFormsIntegration.dll" />
+  </ItemGroup>
+
   <!-- References that are common to both WinForms and WPF -->
   <ItemGroup>
     <FrameworkListFileClass Include="Accessibility.dll" Profile="WindowsForms;WPF" />
@@ -56,7 +61,6 @@
     <FrameworkListFileClass Include="System.Security.Permissions.dll" Profile="WindowsForms;WPF" />
     <FrameworkListFileClass Include="System.Threading.AccessControl.dll" Profile="WindowsForms;WPF" />
     <FrameworkListFileClass Include="System.Windows.Extensions.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="WindowsFormsIntegration.dll"  Profile="WindowsForms;WPF"/>
   </ItemGroup>
 
   <!-- WPF specific references -->

diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj
@@ -9,20 +9,14 @@
     <RollForward>LatestPatch</RollForward>
   </PropertyGroup>
 
+  <!-- Profile is intentionally undefined so that the reference will only be included when no profile is specified i.e. both WPF and WindowsForms are in use https://github.com/dotnet/wpf/blob/bbfc24fd13804a191e20064acd599b0a359092df/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props#L45-L46 -->
+  <ItemGroup>
+    <FrameworkListFileClass Include="WindowsFormsIntegration.resources.dll" />
+  </ItemGroup>
+
   <!-- References that are common to both WinForms and WPF -->
   <ItemGroup>
     <FrameworkListFileClass Include="System.Diagnostics.EventLog.Messages.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="System.Xaml.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="UIAutomationClient.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="UIAutomationClientSideProviders.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="UIAutomationProvider.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="UIAutomationTypes.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="WindowsBase.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="WindowsFormsIntegration.resources.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="PenImc_cor3.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="vcruntime140_cor3.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Include="wpfgfx_cor3.dll" Profile="WindowsForms;WPF" />
-    <FrameworkListFileClass Condition="'$(PlatformTarget)' != 'ARM64'" Include="D3DCompiler_47_cor3.dll" Profile="WindowsForms;WPF" />
   </ItemGroup>
 
   <!-- Windows Forms specific references -->
@@ -41,24 +35,34 @@
     <FrameworkListFileClass Include="System.Windows.Forms.Design.resources.dll" Profile="WindowsForms" />
     <FrameworkListFileClass Include="System.Windows.Forms.Primitives.resources.dll" Profile="WindowsForms" />
     <FrameworkListFileClass Include="System.Windows.Forms.resources.dll" Profile="WindowsForms" />
-    <FrameworkListFileClass Include="System.Windows.Input.Manipulations.resources.dll" Profile="WindowsForms" />
     <FrameworkListFileClass Include="System.Private.Windows.Core.dll" Profile="WindowsForms" />
   </ItemGroup>
 
   <!-- WPF specific references -->
   <ItemGroup>
+    <FrameworkListFileClass Condition="'$(PlatformTarget)' != 'ARM64'" Include="D3DCompiler_47_cor3.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="DirectWriteForwarder.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="PenImc_cor3.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationCore.resources.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework.Fluent.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework.resources.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationUI.resources.dll" Profile="WPF" />
-    <FrameworkListFileClass Include="ReachFramework.resources.dll" Profile="WPF" />
-    <FrameworkListFileClass Include="System.Windows.Controls.Ribbon.resources.dll" Profile="WPF" />
-    <FrameworkListFileClass Include="DirectWriteForwarder.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework-SystemCore.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework-SystemData.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework-SystemDrawing.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework-SystemXml.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationFramework-SystemXmlLinq.dll" Profile="WPF" />
     <FrameworkListFileClass Include="PresentationNative_cor3.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="ReachFramework.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="System.Windows.Controls.Ribbon.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="System.Windows.Input.Manipulations.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="System.Xaml.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="UIAutomationClient.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="UIAutomationClientSideProviders.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="UIAutomationProvider.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="UIAutomationTypes.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="vcruntime140_cor3.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="WindowsBase.resources.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="wpfgfx_cor3.dll" Profile="WPF" />
   </ItemGroup>
 </Project>