aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-19 12:10:19 -0700
committerRob Mensching <rob@firegiant.com>2021-03-19 12:15:11 -0700
commit4d27a43eb676e48a6ae6213e234f519b6af8c8a7 (patch)
tree698e6e87ff52229a726301341c7342f410088903
parent3d5c85c88fc7440b0e232173a18f80f3363c039a (diff)
downloadwix-4d27a43eb676e48a6ae6213e234f519b6af8c8a7.tar.gz
wix-4d27a43eb676e48a6ae6213e234f519b6af8c8a7.tar.bz2
wix-4d27a43eb676e48a6ae6213e234f519b6af8c8a7.zip
Minor test clean up
-rw-r--r--src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs (renamed from src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs)0
-rw-r--r--src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs (renamed from src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs)0
-rw-r--r--src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl11
-rw-r--r--src/test/WixToolsetTest.Util/UtilExtensionFixture.cs2
4 files changed, 1 insertions, 12 deletions
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
index 2a9daa1c..2a9daa1c 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
index 2a1b4347..2a1b4347 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<!--
4This file contains the declaration of all the localizable strings.
5-->
6<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
7
8 <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
9 <String Id="FeatureTitle">MsiPackage</String>
10
11</WixLocalization>
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 3e2a97f9..b2af91b3 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -96,7 +96,7 @@ namespace WixToolsetTest.Util
96 public void CanBuildInternetShortcutInMergeModule() 96 public void CanBuildInternetShortcutInMergeModule()
97 { 97 {
98 var folder = TestData.Get(@"TestData\InternetShortcutModule"); 98 var folder = TestData.Get(@"TestData\InternetShortcutModule");
99 var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); 99 var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }, "test.msm");
100 100
101 var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); 101 var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut");
102 WixAssert.CompareLineByLine(new[] 102 WixAssert.CompareLineByLine(new[]