Skip to content

Move common files to props file #4462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 20, 2024
Merged

Move common files to props file #4462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95f0db5
Move common files to props file
LakshanF Jun 19, 2024
ee9e33e
Forgot to move the WPF specific file
LakshanF Jun 19, 2024
1e45692
Merge branch 'main' into MoveCommonFiles
LakshanF Jun 20, 2024
7868bcc
fixing an issue with merging main
LakshanF Jun 20, 2024
28e775a
Merge with main
LakshanF Jun 20, 2024
94285f6
Remove Hashing assembly
LakshanF Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions src/windowsdesktop/src/sfx/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,49 @@
<PackageReference Include="Microsoft.Internal.Runtime.WindowsDesktop.Transport" />
</ItemGroup>

<!-- References that are common to both WinForms and WPF -->
<ItemGroup>
<FrameworkListFileClass Include="Accessibility.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.Registry.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.SystemEvents.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.CodeDom.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Configuration.ConfigurationManager.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.EventLog.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.PerformanceCounter.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.DirectoryServices.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Formats.Nrbf.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.IO.Packaging.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Resources.Extensions.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Pkcs.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.ProtectedData.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Xml.dll" Profile="WindowsForms;WPF" />
<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 -->
<ItemGroup>
<FrameworkListFileClass Include="PresentationCore.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Aero.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Aero2.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.AeroLite.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Classic.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Luna.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Royale.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationUI.dll" Profile="WPF" />
<FrameworkListFileClass Include="ReachFramework.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Printing.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Controls.Ribbon.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Input.Manipulations.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Presentation.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Xaml.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationClient.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationClientSideProviders.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationProvider.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationTypes.dll" Profile="WPF" />
<FrameworkListFileClass Include="WindowsBase.dll" Profile="WPF" />
</ItemGroup>
</Project>
49 changes: 0 additions & 49 deletions src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,62 +10,13 @@
<CreatePlatformManifest Condition="'$(PreReleaseVersionLabel)' == 'servicing'">false</CreatePlatformManifest>
</PropertyGroup>

<!--
Shared concerns, these shouldn't generally change
For profile information refer to https://github.com/dotnet/cli/issues/10536#issuecomment-488871926
-->
<ItemGroup>
<FrameworkListFileClass Include="Accessibility.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.Registry.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.SystemEvents.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.CodeDom.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Configuration.ConfigurationManager.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.EventLog.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.PerformanceCounter.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.DirectoryServices.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Formats.Nrbf.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.IO.Packaging.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Resources.Extensions.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Pkcs.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.ProtectedData.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Xml.dll" Profile="WindowsForms;WPF" />
<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" />
</ItemGroup>

<!--
Windows Forms specific references
see: https://github.com/dotnet/winforms/tree/main/pkg/Microsoft.Private.Winforms/sdk/dotnet-windowsdesktop
-->
<Import Project="$(PkgMicrosoft_Private_Winforms)\sdk\dotnet-windowsdesktop\System.Windows.Forms.FileClassification.props"
Condition="Exists('$(PkgMicrosoft_Private_Winforms)')" />

<!-- WPF specific references -->
<ItemGroup>
<FrameworkListFileClass Include="PresentationCore.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Aero.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Aero2.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.AeroLite.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Classic.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Luna.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Royale.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationUI.dll" Profile="WPF" />
<FrameworkListFileClass Include="ReachFramework.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Printing.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Controls.Ribbon.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Input.Manipulations.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Presentation.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Xaml.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationClient.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationClientSideProviders.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationProvider.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationTypes.dll" Profile="WPF" />
<FrameworkListFileClass Include="WindowsBase.dll" Profile="WPF" />
</ItemGroup>

<ItemGroup>
<!-- We don't have a ref assembly for DirectWriteForwarder -->
<IgnoredReference Include="DirectWriteForwarder" />
Expand Down
45 changes: 2 additions & 43 deletions src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,9 @@
<RollForward>LatestPatch</RollForward>
</PropertyGroup>

<!--
Shared concerns, these shouldn't generally change
For profile information refer to https://github.com/dotnet/cli/issues/10536#issuecomment-488871926
-->
<!-- References that are common to both WinForms and WPF -->
<ItemGroup>
<FrameworkListFileClass Include="Accessibility.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.Registry.AccessControl.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="Microsoft.Win32.SystemEvents.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.CodeDom.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Configuration.ConfigurationManager.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.EventLog.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Diagnostics.PerformanceCounter.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.DirectoryServices.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Formats.Nrbf.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.IO.Packaging.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Resources.Extensions.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Pkcs.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.ProtectedData.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Security.Cryptography.Xml.dll" Profile="WindowsForms;WPF" />
<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="System.Diagnostics.EventLog.Messages.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="WindowsFormsIntegration.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" />
Expand All @@ -42,7 +21,6 @@
<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="PresentationNative_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" />
Expand Down Expand Up @@ -70,37 +48,18 @@

<!-- WPF specific references -->
<ItemGroup>
<FrameworkListFileClass Include="PresentationCore.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationCore.resources.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Aero.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Aero2.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.AeroLite.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Classic.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Fluent.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.resources.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Luna.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationFramework.Royale.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationUI.dll" Profile="WPF" />
<FrameworkListFileClass Include="PresentationUI.resources.dll" Profile="WPF" />
<FrameworkListFileClass Include="ReachFramework.dll" Profile="WPF" />
<FrameworkListFileClass Include="ReachFramework.resources.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Printing.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Controls.Ribbon.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Controls.Ribbon.resources.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Input.Manipulations.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Windows.Presentation.dll" Profile="WPF" />
<FrameworkListFileClass Include="System.Xaml.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationClient.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationClientSideProviders.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationProvider.dll" Profile="WPF" />
<FrameworkListFileClass Include="UIAutomationTypes.dll" Profile="WPF" />
<FrameworkListFileClass Include="WindowsBase.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" />
</ItemGroup>
</Project>