aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2023-03-14 19:38:11 -0700
committerRob Mensching <rob@firegiant.com>2023-03-14 21:31:31 -0600
commitf586aef92e67e547cf2ea6e3259b60521695efa9 (patch)
tree11a207d0eb99f4b01536b80020f6f368ac5f411e
parent68ea7b2f8dccb48d69e8aeb960ce8cb29790e8c4 (diff)
downloadwix-f586aef92e67e547cf2ea6e3259b60521695efa9.tar.gz
wix-f586aef92e67e547cf2ea6e3259b60521695efa9.tar.bz2
wix-f586aef92e67e547cf2ea6e3259b60521695efa9.zip
Remove obsolete Product OutputType
Fixes 7273
-rw-r--r--src/api/wix/WixToolset.Data/OutputType.cs4
-rw-r--r--src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs6
2 files changed, 3 insertions, 7 deletions
diff --git a/src/api/wix/WixToolset.Data/OutputType.cs b/src/api/wix/WixToolset.Data/OutputType.cs
index 6d31d962..abe484bd 100644
--- a/src/api/wix/WixToolset.Data/OutputType.cs
+++ b/src/api/wix/WixToolset.Data/OutputType.cs
@@ -30,10 +30,6 @@ namespace WixToolset.Data
30 /// <summary>Package output type.</summary> 30 /// <summary>Package output type.</summary>
31 Package, 31 Package,
32 32
33 /// <summary>Package output type.</summary>
34 [Obsolete]
35 Product = Package,
36
37 /// <summary>Transform output type.</summary> 33 /// <summary>Transform output type.</summary>
38 Transform, 34 Transform,
39 35
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
index 4478e0ea..d1633b1e 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
@@ -86,7 +86,7 @@ namespace WixToolsetTest.CoreIntegration
86 [Fact] 86 [Fact]
87 public void MissingEntrySectionDetectedPackage() 87 public void MissingEntrySectionDetectedPackage()
88 { 88 {
89 var folder = TestData.Get(@"TestData\OverridableActions"); 89 var folder = TestData.Get("TestData", "OverridableActions");
90 90
91 using (var fs = new DisposableFileSystem()) 91 using (var fs = new DisposableFileSystem())
92 { 92 {
@@ -100,12 +100,12 @@ namespace WixToolsetTest.CoreIntegration
100 "build", 100 "build",
101 Path.Combine(folder, "PackageComponents.wxs"), 101 Path.Combine(folder, "PackageComponents.wxs"),
102 "-intermediateFolder", intermediateFolder, 102 "-intermediateFolder", intermediateFolder,
103 "-o", Path.Combine(baseFolder, @"bin\test.msi") 103 "-o", Path.Combine(baseFolder, "bin", "test.msi")
104 }); 104 });
105 } 105 }
106 catch (WixException we) 106 catch (WixException we)
107 { 107 {
108 WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Expected section of type 'Product'.", we.Message); 108 WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Expected section of type 'Package'.", we.Message);
109 return; 109 return;
110 } 110 }
111 111