ContainerTemplateUT: Fix taking too many payloads into WixAttachedCon…

…tainer
nirbar · Dec 1, 2024 · 93d355e · 93d355e
1 parent 1e14be0
commit 93d355e
Show file tree

Hide file tree

Showing 29 changed files with 31 additions and 32 deletions.
diff --git a/src/PanelSwWixExtension/PanelSwBurnBackendBinder.cs b/src/PanelSwWixExtension/PanelSwBurnBackendBinder.cs
@@ -141,7 +141,7 @@ private void FinalizeAutoContainers(IntermediateSection section)
                 for (int i = myPayloadSymbols.Count - 1; i >= 0; --i)
                 {
                     WixBundlePayloadSymbol payload = myPayloadSymbols[i];
-                    if (!payload.FileSize.HasValue || (containerSize[defaultContainer] + payload.FileSize.Value) < containerTemplate.MaximumUncompressedExeSize)
+                    if (!payload.FileSize.HasValue || (containerSize[defaultContainer] + payload.FileSize.Value + exeSize) < containerTemplate.MaximumUncompressedExeSize)
                     {
                         containerSize[defaultContainer] += payload.FileSize ?? 0;
                         payload.ContainerRef = defaultContainer.Id.Id;
@@ -160,7 +160,7 @@ private void FinalizeAutoContainers(IntermediateSection section)
                 if ((prevContainer != null) && (prevPayload != null) && (SortPayloads(payload, prevPayload, groupSymbols) == 0))
                 {
                     long maxContainerSize = ((prevContainer == defaultContainer) && (defaultContainer.Type == ContainerType.Attached) && (containerTemplate.MaximumUncompressedContainerSize > containerTemplate.MaximumUncompressedExeSize))
-                        ? containerTemplate.MaximumUncompressedExeSize : containerTemplate.MaximumUncompressedContainerSize;
+                        ? containerTemplate.MaximumUncompressedExeSize - exeSize : containerTemplate.MaximumUncompressedContainerSize;
 
                     // Previous container has enough capacity ?
                     if (!payload.FileSize.HasValue || ((containerSize[prevContainer] + payload.FileSize.Value) < maxContainerSize))

diff --git a/src/PanelSwWixExtension/PanelSwWixCompiler.cs b/src/PanelSwWixExtension/PanelSwWixCompiler.cs
@@ -528,7 +528,7 @@ private void ParseContainerTemplateElement(IntermediateSection section, XElement
             }
             if ((maximumUncompressedContainerSize < long.MaxValue) && !cabinetTemplate.Contains("{0}"))
             {
-                Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "CabinetTemplate", cabinetTemplate, "Must contain format string {0}"));
+                Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "NameTemplate", cabinetTemplate, "Must contain format string {0}"));
             }
             if ((defaultType == ContainerType.Detached) && (maximumUncompressedExeSize > 0))
             {

diff --git a/src/TidyBuild.custom.props b/src/TidyBuild.custom.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)TidyBuild.user.props" Condition="Exists('$(MSBuildThisFileDirectory)TidyBuild.user.props')"/>
   <PropertyGroup>
-    <FullVersion>5.4.2</FullVersion>
+    <FullVersion>5.4.3</FullVersion>
     <FullVersion Condition=" '$(GITHUB_RUN_NUMBER)'!='' ">$(FullVersion).$(GITHUB_RUN_NUMBER)</FullVersion>
     <ProductName>PanelSwWixExtension</ProductName>
     <Manufacturer>Panel::Software</Manufacturer>

diff --git a/src/UnitTests/AccountNamesUT/AccountNamesUT.wxs b/src/UnitTests/AccountNamesUT/AccountNamesUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="AccountNamesUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="AccountNamesUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 

diff --git a/src/UnitTests/AccountSidSearchUT/AccountSidSearchUT.wxs b/src/UnitTests/AccountSidSearchUT/AccountSidSearchUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="AccountSidSearchUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="AccountSidSearchUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 

diff --git a/src/UnitTests/CleanPendingFileRenameOperationsUT/CleanPendingFileRenameOperationsUT.wxs b/src/UnitTests/CleanPendingFileRenameOperationsUT/CleanPendingFileRenameOperationsUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="CleanPendingFileRenameOperationsUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="CleanPendingFileRenameOperationsUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/ContainerTemplateUT/ContainerTemplateUT.wxs b/src/UnitTests/ContainerTemplateUT/ContainerTemplateUT.wxs
@@ -6,7 +6,7 @@
       <PayloadGroupRef Id="ContainerTemplateUT"/>
     </BootstrapperApplication>
     <?if $(EnableZipContainer) ~= true?>
-    <PanelSW:ContainerTemplate DefaultType="detached" Compression="SevenZip" NameTemplate="$(TargetName).7z"/>
+    <PanelSW:ContainerTemplate DefaultType="attached" Compression="SevenZip" NameTemplate="$(TargetName).7z"/>
     <?else?>
     <PanelSW:ContainerTemplate DefaultType="detached"/>
     <?endif?>

diff --git a/src/UnitTests/CustomActionDataUT/CustomActionDataUT.wxs b/src/UnitTests/CustomActionDataUT/CustomActionDataUT.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
 
-  <Package Name="CustomActionDataUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="CustomActionDataUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 

diff --git a/src/UnitTests/DuplicateFolderUT/DuplicateFolderUT.wxs b/src/UnitTests/DuplicateFolderUT/DuplicateFolderUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="DuplicateFolderUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="DuplicateFolderUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/EvaluateExpressionUT/EvaluateExpressionUT.wxs b/src/UnitTests/EvaluateExpressionUT/EvaluateExpressionUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="RegexUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="RegexUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/ExecuteCommandUT/ExecuteCommandUT.wxs b/src/UnitTests/ExecuteCommandUT/ExecuteCommandUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="ExecuteCommandUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="ExecuteCommandUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 

diff --git a/src/UnitTests/FileGlobUT/FileGlobUT.wxs b/src/UnitTests/FileGlobUT/FileGlobUT.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/Xsd/PanelSwWixExtension.xsd">
-  <Package Name="FileGlobUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="FileGlobUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/InstallUtilUT/InstallUtilUT.wxs b/src/UnitTests/InstallUtilUT/InstallUtilUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="InstallUtilUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="InstallUtilUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/IsWindowsVersionOrGreaterUT/IsWindowsVersionOrGreaterUT.wxs b/src/UnitTests/IsWindowsVersionOrGreaterUT/IsWindowsVersionOrGreaterUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="IsWindowsVersionOrGreater" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="IsWindowsVersionOrGreater" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A no older version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/JsonJPathUT/JsonJPathUT.wxs b/src/UnitTests/JsonJPathUT/JsonJPathUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="JsonJPathUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="JsonJPathUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/ListProcessorFeaturesUT/ListProcessorFeaturesUT.wxs b/src/UnitTests/ListProcessorFeaturesUT/ListProcessorFeaturesUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="ListProcessorFeaturesUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="ListProcessorFeaturesUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/Md5HashUT/Md5HashUT.wxs b/src/UnitTests/Md5HashUT/Md5HashUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="Md5HashUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="Md5HashUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/MsiSqlQueryUT/MsiSqlQueryUT.wxs b/src/UnitTests/MsiSqlQueryUT/MsiSqlQueryUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="MsiSqlQueryUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="MsiSqlQueryUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
 
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

diff --git a/src/UnitTests/PathSearchUT/PathSearchUT.wxs b/src/UnitTests/PathSearchUT/PathSearchUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="PathSearchUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="PathSearchUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/PreprocessorUT/PreprocessorUT.wxs b/src/UnitTests/PreprocessorUT/PreprocessorUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="PreprocessorUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="PreprocessorUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
 

diff --git a/src/UnitTests/RegexUT/RegexUT.wxs b/src/UnitTests/RegexUT/RegexUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="RegexUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="RegexUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">

diff --git a/src/UnitTests/ServiceConfigUT/ServiceConfigUT.wxs b/src/UnitTests/ServiceConfigUT/ServiceConfigUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="ServiceConfigUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="ServiceConfigUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Property Id="HIDE_ME" Hidden="yes" Value="123" />

diff --git a/src/UnitTests/SetPropertyFromPipe/SetPropertyFromPipeSetup/SetPropertyFromPipeSetup.wxs b/src/UnitTests/SetPropertyFromPipe/SetPropertyFromPipeSetup/SetPropertyFromPipeSetup.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension">
-  <Package Name="SetPropertyFromPipeSetup" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="SetPropertyFromPipeSetup" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <PanelSW:SetPropertyFromPipe PipeName="[PIPE_NAME]" />

diff --git a/src/UnitTests/SplitFileUT/SplitFileUT.wxs b/src/UnitTests/SplitFileUT/SplitFileUT.wxs
@@ -1,7 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="SplitFileUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}"><MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-
+  <Package Name="SplitFileUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">
       <Component Directory="INSTALLFOLDER" Guid="{9CF0C21D-C68E-4851-99AE-44BD6B763F21}" Id="_1">
         <File Id="___sys.SOURCEFILEPATH_" Source="$(sys.SOURCEFILEPATH)">

diff --git a/src/UnitTests/StringUT/StringUT.wxs b/src/UnitTests/StringUT/StringUT.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:PanelSW="http://schemas.panel-sw.co.il/wix/WixExtension" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.panel-sw.co.il/wix/WixExtension ../../PanelSwWixExtension/XSD/PanelSwWixExtension.xsd">
-  <Package Name="StringUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200" ProductCode="{B7318C42-2252-44B9-A1E5-47CCD5163D9D}">
+  <Package Name="StringUT" Language="1033" Version="$(var.JetVersion)" Manufacturer="$(var.JetManufacturer)" UpgradeCode="{B997AF76-8F98-40D1-B123-552C82C40B37}" InstallerVersion="200">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="UnitTestSetup" Level="1">