Only referenced components get default feature.v6.0.0-rc.2

Fixes https://github.com/wixtoolset/issues/issues/8882
Fixes https://github.com/wixtoolset/issues/issues/8939

8 files changed, 43 insertions, 64 deletions

diff --git a/src/api/wix/WixToolset.Data/WixStandardLibrary.cs b/src/api/wix/WixToolset.Data/WixStandardLibrary.cs
index dc7c5a8b..2d2a12fb 100644
--- a/src/api/wix/WixToolset.Data/WixStandardLibrary.cs
+++ b/src/api/wix/WixToolset.Data/WixStandardLibrary.cs
@@ -93,20 +93,6 @@ namespace WixToolset.Data
                 yield return section;
             }
 
-            // Default feature.
-            {
-                var symbol = new FeatureSymbol(sourceLineNumber, new Identifier(AccessModifier.Virtual, WixStandardLibraryIdentifiers.DefaultFeatureName))
-                {
-                    Level = 1,
-                    Display = 0,
-                    InstallDefault = FeatureInstallDefault.Local,
-                };
-
-                var section = CreateSectionAroundSymbol(symbol);
-
-                yield return section;
-            }
-
             // Package References.
             {
                 var section = CreateSection(WixStandardLibraryIdentifiers.WixStandardPackageReferences);
diff --git a/src/api/wix/WixToolset.Data/WixStandardLibraryIdentifiers.cs b/src/api/wix/WixToolset.Data/WixStandardLibraryIdentifiers.cs
index 73e4245b..a7ca11fe 100644
--- a/src/api/wix/WixToolset.Data/WixStandardLibraryIdentifiers.cs
+++ b/src/api/wix/WixToolset.Data/WixStandardLibraryIdentifiers.cs
@@ -18,11 +18,6 @@ namespace WixToolset.Data
         public static readonly string WixStandardModuleReferences = "WixStandardModuleReferences";
 
         /// <summary>
-        /// Default feature name.
-        /// </summary>
-        public static readonly string DefaultFeatureName = "WixDefaultFeature";
-
-        /// <summary>
         /// WiX Standard localization strings.
         /// </summary>
         public static readonly string WixStandardLocalizationStrings = "WixStandardLocalizationStrings";
diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
index df398d0f..66bbe766 100644
--- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
+++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
@@ -1,24 +1,14 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)">
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
+    <Component>
+      <File Id="ThmViewerFile" Source="thmviewer.exe" />
+      <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
+      <RemoveFolder Directory="ShortcutFolder" On="uninstall" />
+    </Component>
   </Package>
 
   <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin">
-      <Component>
-        <File Id="ThmViewerFile" Source="thmviewer.exe" />
-        <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
-        <RemoveFolder Directory="ShortcutFolder" On="uninstall" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-
-  <Fragment>
     <StandardDirectory Id="ProgramFilesFolder">
       <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)" />
     </StandardDirectory>
diff --git a/src/wix/WixToolset.Core/AssignDefaultFeatureCommand.cs b/src/wix/WixToolset.Core/AssignDefaultFeatureCommand.cs
index 614af1eb..3d4001a3 100644
--- a/src/wix/WixToolset.Core/AssignDefaultFeatureCommand.cs
+++ b/src/wix/WixToolset.Core/AssignDefaultFeatureCommand.cs
@@ -10,20 +10,22 @@ namespace WixToolset.Core
 
     internal class AssignDefaultFeatureCommand
     {
-        public AssignDefaultFeatureCommand(FindEntrySectionAndLoadSymbolsCommand find, List<IntermediateSection> sections)
+        private static readonly string DefaultFeatureName = "WixDefaultFeature";
+
+        public AssignDefaultFeatureCommand(FindEntrySectionAndLoadSymbolsCommand find, ISet<IntermediateSection> sections)
         {
             this.Find = find;
             this.Sections = sections;
         }
 
-        public IEnumerable<IntermediateSection> Sections { get; }
+        public ISet<IntermediateSection> Sections { get; }
 
         public FindEntrySectionAndLoadSymbolsCommand Find { get; }
 
         public void Execute()
         {
             if (this.Find.EntrySection.Type == SectionType.Package
-                && !this.Sections.Where(s => s.Id != WixStandardLibraryIdentifiers.DefaultFeatureName)
+                && !this.Sections.Where(s => s.Id != DefaultFeatureName)
                 .SelectMany(s => s.Symbols).OfType<FeatureSymbol>().Any())
             {
                 var addedToDefaultFeature = false;
@@ -35,7 +37,7 @@ namespace WixToolset.Core
                     {
                         this.Find.EntrySection.AddSymbol(new WixComplexReferenceSymbol(component.SourceLineNumbers)
                         {
-                            Parent = WixStandardLibraryIdentifiers.DefaultFeatureName,
+                            Parent = DefaultFeatureName,
                             ParentType = ComplexReferenceParentType.Feature,
                             ParentLanguage = null,
                             Child = component.Id.Id,
@@ -45,7 +47,7 @@ namespace WixToolset.Core
 
                         this.Find.EntrySection.AddSymbol(new WixGroupSymbol(component.SourceLineNumbers)
                         {
-                            ParentId = WixStandardLibraryIdentifiers.DefaultFeatureName,
+                            ParentId = DefaultFeatureName,
                             ParentType = ComplexReferenceParentType.Feature,
                             ChildId = component.Id.Id,
                             ChildType = ComplexReferenceChildType.Component,
@@ -57,10 +59,11 @@ namespace WixToolset.Core
 
                 if (addedToDefaultFeature)
                 {
-                    this.Find.EntrySection.AddSymbol(new WixSimpleReferenceSymbol()
+                    this.Find.EntrySection.AddSymbol(new FeatureSymbol(null, new Identifier(AccessModifier.Virtual, DefaultFeatureName))
                     {
-                        Table = "Feature",
-                        PrimaryKeys = WixStandardLibraryIdentifiers.DefaultFeatureName,
+                        Level = 1,
+                        Display = 0,
+                        InstallDefault = FeatureInstallDefault.Local,
                     });
                 }
             }
diff --git a/src/wix/WixToolset.Core/Linker.cs b/src/wix/WixToolset.Core/Linker.cs
index b10a12d8..d2e09b59 100644
--- a/src/wix/WixToolset.Core/Linker.cs
+++ b/src/wix/WixToolset.Core/Linker.cs
@@ -138,13 +138,6 @@ namespace WixToolset.Core
                     command.Execute();
                 }
 
-                // If there are no authored features, create a default feature and assign
-                // the components to it.
-                {
-                    var command = new AssignDefaultFeatureCommand(find, sections);
-                    command.Execute();
-                }
-
                 // Resolve the symbol references to find the set of sections we care about for linking.
                 // Of course, we start with the entry section (that's how it got its name after all).
                 var resolve = new ResolveReferencesCommand(this.Messaging, find.EntrySection, find.SymbolsByName);
@@ -155,6 +148,13 @@ namespace WixToolset.Core
                     return null;
                 }
 
+                // If there are no authored features, create a default feature and assign
+                // the components to it.
+                {
+                    var command = new AssignDefaultFeatureCommand(find, resolve.ResolvedSections);
+                    command.Execute();
+                }
+
                 // Reset the sections to only those that were resolved then flatten the complex
                 // references that particpate in groups.
                 sections = resolve.ResolvedSections.ToList();
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/FeatureFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/FeatureFixture.cs
index 00fea67e..f8fb41a2 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/FeatureFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/FeatureFixture.cs
@@ -66,6 +66,17 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Empty(result.Messages);
 
                 Assert.True(File.Exists(msiPath));
+
+                result = WixRunner.Execute(new[]
+                {
+                    "msi",
+                    "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    msiPath
+                });
+
+                Assert.Empty(result.Messages);
+
                 var results = Query.QueryDatabase(msiPath, new[] { "Feature", "FeatureComponents", "Shortcut" });
                 WixAssert.CompareLineByLine(new[]
                 {
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Feature/PackageDefaultFeature.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Feature/PackageDefaultFeature.wxs
index bd93e53c..da214e19 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Feature/PackageDefaultFeature.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Feature/PackageDefaultFeature.wxs
@@ -47,4 +47,10 @@
             <File Name="test4.txt" Source="test.txt" />
         </Component>
     </Fragment>
+
+    <Fragment>
+        <Component Id="UnreferencedComponentInAFragment" Directory="INSTALLFOLDER">
+            <File Name="test5.txt" Source="test.txt" />
+        </Component>
+    </Fragment>
 </Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
index 8fff563e..26eaaf19 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ForEach/Package.wxs
@@ -1,19 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="MsiPackage" Language="1033" Version="1.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine">
-    
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-        <ComponentGroupRef Id="ProductComponents.x86" />
-        <ComponentGroupRef Id="ProductComponents.x64" />
-        <ComponentGroupRef Id="ProductComponents.arm" />
-    </Feature>
+    <ComponentGroupRef Id="ProductComponents.x86" />
+    <ComponentGroupRef Id="ProductComponents.x64" />
+    <ComponentGroupRef Id="ProductComponents.arm" />
   </Package>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-  </Fragment>
 </Wix>