Fix crash with use of File/@patchgroup.

wixtoolset · Sep 3, 2024 · c969c45 · c969c45
1 parent fb76913
commit c969c45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerStandard.cs
@@ -264,7 +264,7 @@ static WindowsInstallerStandard()
                 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/FileCost"))         { Action="FileCost",         Sequence=900, SequenceTable=SequenceTable.AdminUISequence },
                 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/CostFinalize"))     { Action="CostFinalize",     Sequence=1000, SequenceTable=SequenceTable.AdminUISequence },
                 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdminUISequence/ExecuteAction"))    { Action="ExecuteAction",    Sequence=1300, SequenceTable=SequenceTable.AdminUISequence },
-                
+
                 // AdvertiseExecuteSequence
                 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostInitialize"))        { Action="CostInitialize",        Sequence=800, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
                 new WixActionSymbol(null, new Identifier(AccessModifier.Virtual, "AdvertiseExecuteSequence/CostFinalize"))          { Action="CostFinalize",          Sequence=1000, SequenceTable=SequenceTable.AdvertiseExecuteSequence },
@@ -452,9 +452,9 @@ public static bool TryGetStandardAction(string id, out WixActionSymbol standardA
         /// <summary>
         /// Try to get standard action by sequence and action name.
         /// </summary>
-        public static bool TryGetStandardAction(string sequenceName, string actioname, out WixActionSymbol standardAction)
+        public static bool TryGetStandardAction(string sequenceName, string actionName, out WixActionSymbol standardAction)
         {
-            return standardActionsById.TryGetValue(String.Concat(sequenceName, "/", actioname), out standardAction);
+            return standardActionsById.TryGetValue(String.Concat(sequenceName, "/", actionName), out standardAction);
         }
 
         /// <summary>

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
@@ -60,7 +60,7 @@ public void Execute()
 
                     if (facade.PatchGroup.HasValue)
                     {
-                        if (patchGroups.TryGetValue(facade.PatchGroup.Value, out var patchGroup))
+                        if (!patchGroups.TryGetValue(facade.PatchGroup.Value, out var patchGroup))
                         {
                             patchGroup = new List<IFileFacade>();
                             patchGroups.Add(facade.PatchGroup.Value, patchGroup);

diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Package.wxs
@@ -17,7 +17,7 @@
   <Fragment>
     <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
       <Component>
-        <File Source="$(sys.SOURCEFILEPATH)" />
+        <File PatchGroup="22" Source="$(sys.SOURCEFILEPATH)" />
       </Component>
 
       <Component>