From f586aef92e67e547cf2ea6e3259b60521695efa9 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 14 Mar 2023 19:38:11 -0700 Subject: Remove obsolete Product OutputType Fixes 7273 --- src/api/wix/WixToolset.Data/OutputType.cs | 4 ---- src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs | 6 +++--- 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 /// Package output type. Package, - /// Package output type. - [Obsolete] - Product = Package, - /// Transform output type. Transform, 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 [Fact] public void MissingEntrySectionDetectedPackage() { - var folder = TestData.Get(@"TestData\OverridableActions"); + var folder = TestData.Get("TestData", "OverridableActions"); using (var fs = new DisposableFileSystem()) { @@ -100,12 +100,12 @@ namespace WixToolsetTest.CoreIntegration "build", Path.Combine(folder, "PackageComponents.wxs"), "-intermediateFolder", intermediateFolder, - "-o", Path.Combine(baseFolder, @"bin\test.msi") + "-o", Path.Combine(baseFolder, "bin", "test.msi") }); } catch (WixException we) { - WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Expected section of type 'Product'.", we.Message); + WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Expected section of type 'Package'.", we.Message); return; } -- cgit v1.2.3-55-g6feb