aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-23 01:11:19 -0700
committerRob Mensching <rob@firegiant.com>2020-06-23 16:56:04 -0700
commit9c235551b2fb961cf10ecb307c252fd5de377513 (patch)
treecb1e112e14212655f7dcf985009a158578a967b0 /src/test
parent7987d2f7e2d47427d7571ab7cc3640d7b0bbb7ff (diff)
downloadwix-9c235551b2fb961cf10ecb307c252fd5de377513.tar.gz
wix-9c235551b2fb961cf10ecb307c252fd5de377513.tar.bz2
wix-9c235551b2fb961cf10ecb307c252fd5de377513.zip
Remove explicit auto-GUIDs
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.Converters/ConditionFixture.cs4
-rw-r--r--src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs2
-rw-r--r--src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs2
-rw-r--r--src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs2
-rw-r--r--src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs2
-rw-r--r--src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
index bd7f52a8..6a5ce1f9 100644
--- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -171,7 +171,7 @@ namespace WixToolsetTest.Converters
171 "<?xml version=\"1.0\" encoding=\"utf-16\"?>", 171 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
172 "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", 172 "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
173 " <Fragment>", 173 " <Fragment>",
174 " <Component Id='Comp1' Directory='ApplicationFolder'>", 174 " <Component Id='Comp1' Guid='*' Directory='ApplicationFolder'>",
175 " <PermissionEx Sddl='sddl'>", 175 " <PermissionEx Sddl='sddl'>",
176 " <Condition>1&lt;2</Condition>", 176 " <Condition>1&lt;2</Condition>",
177 " </PermissionEx>", 177 " </PermissionEx>",
@@ -199,7 +199,7 @@ namespace WixToolsetTest.Converters
199 var converter = new Wix3Converter(messaging, 2, null, null); 199 var converter = new Wix3Converter(messaging, 2, null, null);
200 200
201 var errors = converter.ConvertDocument(document); 201 var errors = converter.ConvertDocument(document);
202 Assert.Equal(3, errors); 202 Assert.Equal(4, errors);
203 203
204 var actualLines = UnformattedDocumentLines(document); 204 var actualLines = UnformattedDocumentLines(document);
205 CompareLineByLine(expected, actualLines); 205 CompareLineByLine(expected, actualLines);
diff --git a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
index 860c195f..d05f8e8f 100644
--- a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
@@ -58,7 +58,7 @@ namespace WixToolsetTest.Converters
58 var converter = new Wix3Converter(messaging, 4); 58 var converter = new Wix3Converter(messaging, 4);
59 var errors = converter.ConvertFile(targetFile, true); 59 var errors = converter.ConvertFile(targetFile, true);
60 60
61 Assert.Equal(5, errors); 61 Assert.Equal(6, errors);
62 62
63 var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); 63 var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n");
64 var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); 64 var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n");
diff --git a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
index dcd43e35..72c78653 100644
--- a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
@@ -6,7 +6,7 @@
6<?include WixVer.wxi ?> 6<?include WixVer.wxi ?>
7 7
8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
9 <Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D"> 9 <Product Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" /> 10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" /> 11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
12 12
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs b/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
index b28c94e4..20a5b1d0 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
@@ -6,7 +6,7 @@
6<?include WixVer.wxi ?> 6<?include WixVer.wxi ?>
7 7
8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
9 <Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D"> 9 <Product Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" /> 10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" /> 11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
12 12
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs b/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
index 99cc2151..cb42ea7d 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
@@ -6,7 +6,7 @@
6<?include WixVer.wxi ?> 6<?include WixVer.wxi ?>
7 7
8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
9 <Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D"> 9 <Product Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" /> 10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" /> 11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
12 12
diff --git a/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs b/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
index aacb68fa..0c4fd1fb 100644
--- a/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
@@ -6,7 +6,7 @@
6<?include WixVer.wxi ?> 6<?include WixVer.wxi ?>
7 7
8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> 8<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
9 <Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D"> 9 <Product Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" /> 10 <Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" /> 11 <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
12 12
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-14 19:39:28 +0000