From 6edc5d1e2a289eac50c6d59a29e195353bb023cb Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 29 Dec 2024 14:04:28 -0800 Subject: Add Package/@Id and Bundle/@Id that can replace UpgradeCodes Completes 8584 --- src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 2 +- src/setup/WixAdditionalTools/WixAdditionalTools.wxs | 2 +- src/setup/wix-cli/Package.wxs | 2 +- .../Decompile/Decompiler.cs | 3 +++ src/wix/WixToolset.Core/Compiler.cs | 3 +++ src/wix/WixToolset.Core/Compiler_Bundle.cs | 17 ++++++++++++++--- src/wix/WixToolset.Core/Compiler_Package.cs | 20 ++++++++++++++++++-- .../BundlePackageFixture.cs | 2 +- .../ContainerFixture.cs | 12 ++++++------ .../MsiQueryFixture.cs | 18 ++++++++++-------- .../DuplicateCrossFragmentReference.wxs | 2 +- .../DuplicatePublicOverrideVirtualSymbol.wxs | 2 +- .../DuplicatedOverrideVirtualSymbol.wxs | 2 +- .../AccessModifier/DuplicatedVirtualSymbol.wxs | 2 +- .../TestData/AccessModifier/HasVirtualSymbol.wxs | 2 +- .../AccessModifier/InvalidCrossFragmentReference.wxs | 2 +- .../AccessModifier/OverrideVirtualSymbol.wxs | 2 +- .../OverrideVirtualSymbolWithFragments.wxs | 2 +- .../AccessModifier/OverrideWithoutVirtualSymbol.wxs | 2 +- .../AccessModifier/VirtualSymbolOverridden.wxs | 2 +- .../VirtualSymbolThatDoesNotGetOverridden.wxs | 2 +- .../AccessModifier/VirtualSymbolWithoutOverride.wxs | 2 +- .../TestData/AllUsers/PerMachine.wxs | 4 ++-- .../TestData/AllUsers/PerUser.wxs | 4 ++-- .../TestData/AllUsers/PerUserOrMachine.wxs | 4 ++-- .../TestData/AppId/TopLevelAppId.wxs | 2 +- .../TestData/Assembly/Package.wxs | 2 +- .../TestData/Assembly1x/Package.wxs | 2 +- .../TestData/BadIf/Package.wxs | 4 ++-- .../BindVariables/PackageWithBindVariables.wxs | 2 +- .../TestData/BundleAllUsers/AllUsersPackage.wxs | 2 +- .../TestData/Comments/PackageCustom.wxs | 6 +++--- .../TestData/Comments/PackageDefault.wxs | 6 +++--- .../TestData/ComplexExampleExtension/Package.wxs | 2 +- .../TestData/Components/Package.wxs | 2 +- .../TestData/CustomTable/CustomTable-Expected.wxs | 2 +- .../DefaultMajorUpgrade/DefaultMajorUpgrade.wxs | 2 +- .../DefaultMajorUpgradeNone.wxs | 2 +- .../DefaultMajorUpgrade.wxs | 2 +- .../DefaultMajorUpgradeReschedule.wxs | 2 +- .../RedundantSubdirectoryInSecondSection.wxs | 2 +- .../TestData/Encoding/Encoding.wxs | 2 +- .../ProductWithComponentGroupRef/Product.wxs | 2 +- .../WixToolsetTest.CoreIntegration/UpgradeFixture.cs | 4 ++-- .../TestData/SimpleMsiPackage/MsiPackage/Package.wxs | 2 +- .../SingleCultureWithFallbackMsiPackage/Package.wxs | 2 +- .../Wixlib/PackageIncludesWixlib/Package.wxs | 2 +- 47 files changed, 104 insertions(+), 69 deletions(-) (limited to 'src') diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs index eb399686..df398d0f 100644 --- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs @@ -1,6 +1,6 @@  - + diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs index 6a9f945f..9369f32e 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs @@ -2,7 +2,7 @@ - - + diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index 788e87b8..ebf0ae8c 100644 --- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -6216,6 +6216,9 @@ namespace WixToolset.Core.WindowsInstaller.Decompile case "Manufacturer": this.DecompilerHelper.RootElement.SetAttributeValue("Manufacturer", value); continue; + case "PackageId": + this.DecompilerHelper.RootElement.SetAttributeValue("Id", value); + continue; case "ProductCode": this.DecompilerHelper.RootElement.SetAttributeValue("ProductCode", value.ToUpper(CultureInfo.InvariantCulture)); continue; diff --git a/src/wix/WixToolset.Core/Compiler.cs b/src/wix/WixToolset.Core/Compiler.cs index e359f3c1..b4980b07 100644 --- a/src/wix/WixToolset.Core/Compiler.cs +++ b/src/wix/WixToolset.Core/Compiler.cs @@ -29,6 +29,9 @@ namespace WixToolset.Core private const char ComponentIdPlaceholderEnd = (char)167; private Dictionary componentIdPlaceholders; + // As outlined in RFC 4122, this is our namespace for generating name-based (version 3) UUIDs for upgrade codes. + private static readonly Guid UpgradeCodeGuidNamespace = new Guid("{D9C5E8D9-0F97-4D24-A235-91BD2FA169A6}"); + // If these are true you know you are building a module or product // but if they are false you cannot not be sure they will not end // up a product or module. Use these flags carefully. diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs index fcf31014..38dbd4c2 100644 --- a/src/wix/WixToolset.Core/Compiler_Bundle.cs +++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs @@ -115,6 +115,7 @@ namespace WixToolset.Core private void ParseBundleElement(XElement node) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + Identifier id = null; string copyright = null; string aboutUrl = null; var modifyType = WixBundleModifyType.Allowed; @@ -144,6 +145,9 @@ namespace WixToolset.Core { switch (attrib.Name.LocalName) { + case "Id": + id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; case "AboutUrl": aboutUrl = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; @@ -233,7 +237,14 @@ namespace WixToolset.Core if (String.IsNullOrEmpty(upgradeCode)) { - this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "UpgradeCode")); + if (id is null) + { + this.Core.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, node.Name.LocalName, "Id", "UpgradeCode")); + } + else + { + upgradeCode = this.Core.CreateGuid(Compiler.UpgradeCodeGuidNamespace, id.Id); + } } if (String.IsNullOrEmpty(copyright)) @@ -265,7 +276,7 @@ namespace WixToolset.Core logVariablePrefixAndExtension = String.Concat("WixBundleLog:", fileSystemSafeBundleName, ":log"); } - this.activeName = String.IsNullOrEmpty(name) ? Common.GenerateGuid() : name; + this.activeName = String.IsNullOrEmpty(name) ? String.IsNullOrEmpty(id?.Id) ? Common.GenerateGuid() : id.Id : name; this.Core.CreateActiveSection(this.activeName, SectionType.Bundle, this.Context.CompilationId); // Now that the active section is initialized, process only extension attributes and the special ProviderKey attribute. @@ -401,7 +412,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - var symbol = this.Core.AddSymbol(new WixBundleSymbol(sourceLineNumbers) + var symbol = this.Core.AddSymbol(new WixBundleSymbol(sourceLineNumbers, id) { UpgradeCode = upgradeCode, Version = version, diff --git a/src/wix/WixToolset.Core/Compiler_Package.cs b/src/wix/WixToolset.Core/Compiler_Package.cs index b84c5fae..466c87a3 100644 --- a/src/wix/WixToolset.Core/Compiler_Package.cs +++ b/src/wix/WixToolset.Core/Compiler_Package.cs @@ -25,6 +25,7 @@ namespace WixToolset.Core private void ParsePackageElement(XElement node) { var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + Identifier id = null; var compressed = YesNoDefaultType.Default; var sourceBits = 0; string codepage = null; @@ -53,6 +54,9 @@ namespace WixToolset.Core { switch (attrib.Name.LocalName) { + case "Id": + id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); + break; case "Codepage": codepage = this.Core.GetAttributeLocalizableCodePageValue(sourceLineNumbers, attrib); break; @@ -156,7 +160,14 @@ namespace WixToolset.Core if (null == upgradeCode) { - this.Core.Write(WarningMessages.MissingUpgradeCode(sourceLineNumbers)); + if (id is null) + { + this.Core.Write(WarningMessages.MissingUpgradeCode(sourceLineNumbers)); + } + else + { + upgradeCode = this.Core.CreateGuid(Compiler.UpgradeCodeGuidNamespace, id.Id); + } } if (null == version) @@ -179,6 +190,11 @@ namespace WixToolset.Core this.compilingProduct = true; this.Core.CreateActiveSection(productCode, SectionType.Package, this.Context.CompilationId); + if (null != id) + { + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "PackageId"), id.Id, false, false, false, true); + } + this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "Manufacturer"), manufacturer, false, false, false, true); this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductCode"), productCode, false, false, false, true); this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductLanguage"), productLanguage, false, false, false, true); @@ -392,7 +408,7 @@ namespace WixToolset.Core if (!this.Core.EncounteredError) { - this.Core.AddSymbol(new WixPackageSymbol(sourceLineNumbers) + this.Core.AddSymbol(new WixPackageSymbol(sourceLineNumbers, id) { PackageId = productCode, UpgradeCode = upgradeCode, diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs index e4ac2dd6..ce5ad17c 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs @@ -386,7 +386,7 @@ namespace WixToolsetTest.CoreIntegration var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName); WixAssert.CompareLineByLine(new[] { - "", + "", }, packageElements); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs index f0495853..37035664 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs @@ -149,21 +149,21 @@ namespace WixToolsetTest.CoreIntegration var msiPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage", ignoreAttributes); WixAssert.CompareLineByLine(new[] { - "" + + "" + "" + "" + $"" + - "" + - "" + + "" + + "" + "" + "" + "", - "" + + "" + "" + "" + $"" + - "" + - "" + + "" + + "" + "" + "" + "", diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index d1025971..647f5b24 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -2,12 +2,10 @@ namespace WixToolsetTest.CoreIntegration { - using System; using System.IO; using System.Linq; - using Example.Extension; - using WixInternal.TestSupport; using WixInternal.Core.TestPackage; + using WixInternal.TestSupport; using Xunit; public class MsiQueryFixture @@ -929,16 +927,20 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); Assert.True(File.Exists(msiPath)); - var results = Query.QueryDatabase(msiPath, new[] { "Upgrade" }); + var results = Query.QueryDatabase(msiPath, new[] { "Property", "Upgrade" }); + var upgradeRows = results.Where(r => r.StartsWith("Upgrade:")).OrderBy(s => s).ToArray(); WixAssert.CompareLineByLine(new[] { - "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED", - "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t1.0.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED", "Upgrade:{B05772EA-82B8-4DE0-B7EB-45B5F0CCFE6D}\t1.0.0\t\t\t256\t\tRELPRODFOUND", - }, results); + "Upgrade:{C00D7E9A-1276-51ED-B782-A20AB34D4070}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED", + "Upgrade:{C00D7E9A-1276-51ED-B782-A20AB34D4070}\t1.0.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED", + }, upgradeRows); + + var packageId = results.Where(r => r.StartsWith("Property:PackageId\t")).Single(); + Assert.Equal("Property:PackageId\tWixToolsetTest.TestPackage", packageId); var prefix = "Property:SecureCustomProperties\t"; - var secureProperties = Query.QueryDatabase(msiPath, new[] { "Property" }).Where(p => p.StartsWith(prefix)).Single(); + var secureProperties = results.Where(p => p.StartsWith(prefix)).Single(); WixAssert.CompareLineByLine(new[] { "RELPRODFOUND", diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicateCrossFragmentReference.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicateCrossFragmentReference.wxs index 73678cb6..9fb95d3a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicateCrossFragmentReference.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicateCrossFragmentReference.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatePublicOverrideVirtualSymbol.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatePublicOverrideVirtualSymbol.wxs index 7ecf4445..565c94f4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatePublicOverrideVirtualSymbol.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatePublicOverrideVirtualSymbol.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedOverrideVirtualSymbol.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedOverrideVirtualSymbol.wxs index 334b01ca..d96693f7 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedOverrideVirtualSymbol.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedOverrideVirtualSymbol.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedVirtualSymbol.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedVirtualSymbol.wxs index e97d0b57..35a52a1b 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedVirtualSymbol.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/DuplicatedVirtualSymbol.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/HasVirtualSymbol.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/HasVirtualSymbol.wxs index 5cdedf04..16bf27ff 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/HasVirtualSymbol.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/HasVirtualSymbol.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/InvalidCrossFragmentReference.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/InvalidCrossFragmentReference.wxs index 5ba21fb2..b082b0cb 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/InvalidCrossFragmentReference.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/InvalidCrossFragmentReference.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbol.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbol.wxs index 4f4cfc16..52d9c1cc 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbol.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbol.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbolWithFragments.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbolWithFragments.wxs index 9afec003..9c7c638f 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbolWithFragments.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideVirtualSymbolWithFragments.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideWithoutVirtualSymbol.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideWithoutVirtualSymbol.wxs index 1cb749a7..31f29fd9 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideWithoutVirtualSymbol.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/OverrideWithoutVirtualSymbol.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolOverridden.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolOverridden.wxs index 98e96766..b90febc5 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolOverridden.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolOverridden.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolThatDoesNotGetOverridden.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolThatDoesNotGetOverridden.wxs index 123b856d..dd45b873 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolThatDoesNotGetOverridden.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolThatDoesNotGetOverridden.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolWithoutOverride.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolWithoutOverride.wxs index 3db854f5..16da75d2 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolWithoutOverride.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AccessModifier/VirtualSymbolWithoutOverride.wxs @@ -1,6 +1,6 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs index ee243815..71ead52a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerMachine.wxs @@ -1,8 +1,8 @@ - diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs index cc8f7bcd..4657e819 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUser.wxs @@ -1,8 +1,8 @@ - diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs index 19c2cb6e..bf2e9d44 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AllUsers/PerUserOrMachine.wxs @@ -1,8 +1,8 @@ - diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppId/TopLevelAppId.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppId/TopLevelAppId.wxs index 25c0f176..ae2c1501 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppId/TopLevelAppId.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/AppId/TopLevelAppId.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs index c345305d..77d8515f 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Package.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly1x/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly1x/Package.wxs index c345305d..77d8515f 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly1x/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Assembly1x/Package.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs index 1d7ebb94..48bc4841 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs @@ -1,5 +1,5 @@ - - + + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs index 2a0c374f..291423ee 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/AllUsersPackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/AllUsersPackage.wxs index 63046563..1fd61a57 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/AllUsersPackage.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/AllUsersPackage.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageCustom.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageCustom.wxs index 384e3545..893e6c29 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageCustom.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageCustom.wxs @@ -1,8 +1,8 @@ - + Manufacturer="Example Corporation"> diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageDefault.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageDefault.wxs index 655a17e0..1390e95c 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageDefault.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Comments/PackageDefault.wxs @@ -1,8 +1,8 @@ - + Manufacturer="Example Corporation"> diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs index db07af2c..c01bb82b 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ComplexExampleExtension/Package.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs index d7b5bdc0..d0bb5436 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Components/Package.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs index fdcc3438..f377a06e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs index 95ebcd94..098d809e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeNone/DefaultMajorUpgradeNone.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeNone/DefaultMajorUpgradeNone.wxs index 63ff178b..63fea0f4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeNone/DefaultMajorUpgradeNone.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeNone/DefaultMajorUpgradeNone.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeOverride/DefaultMajorUpgrade.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeOverride/DefaultMajorUpgrade.wxs index ce9fd96f..5415dfcb 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeOverride/DefaultMajorUpgrade.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeOverride/DefaultMajorUpgrade.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeReschedule/DefaultMajorUpgradeReschedule.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeReschedule/DefaultMajorUpgradeReschedule.wxs index 3269106b..c7b9cc3c 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeReschedule/DefaultMajorUpgradeReschedule.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgradeReschedule/DefaultMajorUpgradeReschedule.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/RedundantSubdirectoryInSecondSection.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/RedundantSubdirectoryInSecondSection.wxs index fc73ee47..67d913a7 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/RedundantSubdirectoryInSecondSection.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Directory/RedundantSubdirectoryInSecondSection.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Encoding/Encoding.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Encoding/Encoding.wxs index 94ca33b3..100fe4b8 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Encoding/Encoding.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Encoding/Encoding.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs index 433be7f0..a7dd7f1b 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs @@ -2,7 +2,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs index 49c83c07..e17b9b95 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs @@ -69,8 +69,8 @@ namespace WixToolsetTest.CoreIntegration { "LaunchCondition:NOT WIX_DOWNGRADE_DETECTED\tA newer version of [ProductName] is already installed.", "Upgrade:{46649344-6CDF-4531-B91C-DCC088CBF6D3}\t1.0\t\t\t258\t\tPRODUCT", - "Upgrade:{7AB24276-C628-43DB-9E65-A184D052909B}\t\t2.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED", - "Upgrade:{7AB24276-C628-43DB-9E65-A184D052909B}\t2.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED", + "Upgrade:{C00D7E9A-1276-51ED-B782-A20AB34D4070}\t\t2.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED", + "Upgrade:{C00D7E9A-1276-51ED-B782-A20AB34D4070}\t2.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED", }, results); } diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs index 30be1ace..2f1e7b9c 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs @@ -2,7 +2,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs index df24aa33..577fbd56 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/Package.wxs @@ -1,5 +1,5 @@ - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs index fe8298bd..e4310849 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs @@ -1,5 +1,5 @@ - + -- cgit v1.2.3-55-g6feb