From f18d7e628361cd3f2ff14dd3326cbeea68df004f Mon Sep 17 00:00:00 2001 From: Rob Mensching <rob@firegiant.com> Date: Mon, 4 Sep 2023 23:40:46 -0700 Subject: Correctly process build -outputType switch Also add a few additional output types to built-in backends. Fixes 7708 --- src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj | 2 +- src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj | 2 +- src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj | 4 ++-- src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wixproj | 4 ++-- src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj | 4 ++-- src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/test') diff --git a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj index 4809934d..bf20b708 100644 --- a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj +++ b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj @@ -1,7 +1,7 @@ <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> <Project Sdk="WixToolset.Sdk"> <PropertyGroup> - <OutputType>PatchCreation</OutputType> + <OutputType>Patch</OutputType> <TargetExt>.msp</TargetExt> <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> </PropertyGroup> diff --git a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj index c099f008..5fbdd549 100644 --- a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj +++ b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj @@ -1,7 +1,7 @@ <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> <Project Sdk="WixToolset.Sdk"> <PropertyGroup> - <OutputType>PatchCreation</OutputType> + <OutputType>Patch</OutputType> <TargetExt>.msp</TargetExt> <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> </PropertyGroup> diff --git a/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj index da9acb5e..3deb2263 100644 --- a/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj +++ b/src/test/burn/TestData/PatchTests/PatchA2/PatchA2.wixproj @@ -1,7 +1,7 @@ <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> <Project Sdk="WixToolset.Sdk"> <PropertyGroup> - <OutputType>PatchCreation</OutputType> + <OutputType>Patch</OutputType> <TargetExt>.msp</TargetExt> <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> </PropertyGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wixproj index da9acb5e..3deb2263 100644 --- a/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/PatchA/PatchA.wixproj @@ -1,7 +1,7 @@ <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> <Project Sdk="WixToolset.Sdk"> <PropertyGroup> - <OutputType>PatchCreation</OutputType> + <OutputType>Patch</OutputType> <TargetExt>.msp</TargetExt> <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> </PropertyGroup> @@ -9,4 +9,4 @@ <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj b/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj index 81fa9e12..5f9ee5f6 100644 --- a/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/PatchAB/PatchAB.wixproj @@ -1,7 +1,7 @@ <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> <Project Sdk="WixToolset.Sdk"> <PropertyGroup> - <OutputType>PatchCreation</OutputType> + <OutputType>Patch</OutputType> <TargetExt>.msp</TargetExt> <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> </PropertyGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> <ProjectReference Include="..\PackageBv1_0_1\PackageBv1_0_1.wixproj" /> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj b/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj index 81fa9e12..5f9ee5f6 100644 --- a/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/PatchAB2/PatchAB2.wixproj @@ -1,7 +1,7 @@ <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> <Project Sdk="WixToolset.Sdk"> <PropertyGroup> - <OutputType>PatchCreation</OutputType> + <OutputType>Patch</OutputType> <TargetExt>.msp</TargetExt> <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> </PropertyGroup> @@ -11,4 +11,4 @@ <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> <ProjectReference Include="..\PackageBv1_0_1\PackageBv1_0_1.wixproj" /> </ItemGroup> -</Project> \ No newline at end of file +</Project> -- cgit v1.2.3-55-g6feb