Reference WPF theme assemblies by default (dotnet/core-setup#7601)

* Reference WPF theme assemblies by default * Fix test expecting >0 ReferencedByDefault attrs Commit migrated from dotnet/core-setup@6f12a57
hwoodiwiss · Aug 7, 2019 · 1c8fe70 · 1c8fe70
1 parent 42e8138
commit 1c8fe70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/installer/pkg/projects/windowsdesktop/pkg/Directory.Build.props b/src/installer/pkg/projects/windowsdesktop/pkg/Directory.Build.props
@@ -23,13 +23,13 @@
     <FrameworkListFileClass Include="Microsoft.Win32.Registry.dll" Profile="WindowsForms;WPF" />
     <FrameworkListFileClass Include="Microsoft.Win32.SystemEvents.dll" Profile="WindowsForms;WPF" />
     <FrameworkListFileClass Include="PresentationCore.dll" Profile="WPF" />
-    <FrameworkListFileClass Include="PresentationFramework.Aero.dll" Profile="WPF" ReferencedByDefault="false" />
-    <FrameworkListFileClass Include="PresentationFramework.Aero2.dll" Profile="WPF" ReferencedByDefault="false" />
-    <FrameworkListFileClass Include="PresentationFramework.AeroLite.dll" Profile="WPF" ReferencedByDefault="false" />
-    <FrameworkListFileClass Include="PresentationFramework.Classic.dll" Profile="WPF" ReferencedByDefault="false" />
+    <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" ReferencedByDefault="false" />
-    <FrameworkListFileClass Include="PresentationFramework.Royale.dll" Profile="WPF" ReferencedByDefault="false" />
+    <FrameworkListFileClass Include="PresentationFramework.Luna.dll" Profile="WPF" />
+    <FrameworkListFileClass Include="PresentationFramework.Royale.dll" Profile="WPF" />
     <FrameworkListFileClass Include="ReachFramework.dll" Profile="WPF" />
     <FrameworkListFileClass Include="System.CodeDom.dll" Profile="WindowsForms;WPF" />
     <FrameworkListFileClass Include="System.Configuration.ConfigurationManager.dll" Profile="WindowsForms;WPF" />

diff --git a/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs b/src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/WindowsDesktopTests.cs
@@ -56,7 +56,7 @@ public void WindowsDesktopFrameworkListHasClassifications()
                 var files = fxList.Element("FileList").Elements("File").ToArray();
 
                 // Sanity check: did any elements we expect make it into the final file?
-                foreach (var attributeName in new[] { "Profile", "ReferencedByDefault" })
+                foreach (var attributeName in new[] { "Profile" })
                 {
                     Assert.True(
                         files.Any(x => !string.IsNullOrEmpty(x.Attribute(attributeName)?.Value)),