diff options
Diffstat (limited to 'src/test')
43 files changed, 51 insertions, 3 deletions
diff --git a/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj b/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj index 1d3d6f17..01b2401d 100644 --- a/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj +++ b/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <Compile Include="..\..\WixStdBaTests\BundleA\Bundle.wxs" Link="Bundle.wxs" /> | 9 | <Compile Include="..\..\WixStdBaTests\BundleA\Bundle.wxs" Link="Bundle.wxs" /> |
| 10 | <BindPath Include="..\..\WixStdBaTests\BundleA" /> | ||
| 10 | </ItemGroup> | 11 | </ItemGroup> |
| 11 | <ItemGroup> | 12 | <ItemGroup> |
| 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 13 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs index 34071cad..78bda768 100644 --- a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs +++ b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | <!-- 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. --> | 1 | <!-- 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. --> |
| 2 | 2 | ||
| 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 4 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive"> | 4 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" |
| 5 | IconSourceFile="test.ico" Compressed="yes" bal:CommandLineVariables="caseSensitive"> | ||
| 5 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> | 6 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> |
| 6 | 7 | ||
| 7 | <?ifndef UpdateFeed ?> | 8 | <?ifndef UpdateFeed ?> |
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/test.ico b/src/test/burn/TestData/WixStdBaTests/BundleA/test.ico new file mode 100644 index 00000000..906ce324 --- /dev/null +++ b/src/test/burn/TestData/WixStdBaTests/BundleA/test.ico | |||
| Binary files differ | |||
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj index eb01e716..ce25922b 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 10 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 10 | <ProjectReference Include="..\Components\TestComponentNET3\TestComponentNET3.csproj" /> | 11 | <ProjectReference Include="..\Components\TestComponentNET3\TestComponentNET3.csproj" /> |
| 11 | </ItemGroup> | 12 | </ItemGroup> |
| 12 | <ItemGroup> | 13 | <ItemGroup> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj index 629bda1f..164071c3 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 10 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 10 | <ProjectReference Include="..\Components\TestComponentNET4\TestComponentNET4.csproj" /> | 11 | <ProjectReference Include="..\Components\TestComponentNET4\TestComponentNET4.csproj" /> |
| 11 | </ItemGroup> | 12 | </ItemGroup> |
| 12 | <ItemGroup> | 13 | <ItemGroup> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj index 35bfd38d..8b84e27e 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 10 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 10 | <ProjectReference Include="..\Components\TestComponentNative\TestComponentNative.vcxproj" /> | 11 | <ProjectReference Include="..\Components\TestComponentNative\TestComponentNative.vcxproj" /> |
| 11 | </ItemGroup> | 12 | </ItemGroup> |
| 12 | <ItemGroup> | 13 | <ItemGroup> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj index 35bfd38d..8b84e27e 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 9 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 10 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 10 | <ProjectReference Include="..\Components\TestComponentNative\TestComponentNative.vcxproj" /> | 11 | <ProjectReference Include="..\Components\TestComponentNative\TestComponentNative.vcxproj" /> |
| 11 | </ItemGroup> | 12 | </ItemGroup> |
| 12 | <ItemGroup> | 13 | <ItemGroup> |
diff --git a/src/test/msi/TestData/CustomActionFail/CustomActionFail.csproj b/src/test/msi/TestData/CustomActionFail/CustomActionFail.csproj new file mode 100644 index 00000000..3db8bd21 --- /dev/null +++ b/src/test/msi/TestData/CustomActionFail/CustomActionFail.csproj | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | ||
| 2 | |||
| 3 | <PropertyGroup> | ||
| 4 | <OutputType>Exe</OutputType> | ||
| 5 | <TargetFramework>net48</TargetFramework> | ||
| 6 | <LangVersion>9.0</LangVersion> | ||
| 7 | </PropertyGroup> | ||
| 8 | |||
| 9 | </Project> | ||
diff --git a/src/test/msi/TestData/CustomActionFail/Program.cs b/src/test/msi/TestData/CustomActionFail/Program.cs new file mode 100644 index 00000000..f2f00a8a --- /dev/null +++ b/src/test/msi/TestData/CustomActionFail/Program.cs | |||
| @@ -0,0 +1 @@ | |||
| return -1; | |||
diff --git a/src/test/msi/TestData/FirewallExtensionTests/DynamicFirewallRules/DynamicFirewallRules.wixproj b/src/test/msi/TestData/FirewallExtensionTests/DynamicFirewallRules/DynamicFirewallRules.wixproj index b39f7387..3b9205f6 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/DynamicFirewallRules/DynamicFirewallRules.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/DynamicFirewallRules/DynamicFirewallRules.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/FirewallRules/FirewallRules.wixproj b/src/test/msi/TestData/FirewallExtensionTests/FirewallRules/FirewallRules.wixproj index b1770b0f..94fb85e4 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/FirewallRules/FirewallRules.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/FirewallRules/FirewallRules.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesInterfaces/FirewallRulesInterfaces.wixproj b/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesInterfaces/FirewallRulesInterfaces.wixproj index 3c6ef5cf..2f492a72 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesInterfaces/FirewallRulesInterfaces.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesInterfaces/FirewallRulesInterfaces.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesProperties/FirewallRulesProperties.wixproj b/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesProperties/FirewallRulesProperties.wixproj index 38d94265..046dc6ec 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesProperties/FirewallRulesProperties.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/FirewallRulesProperties/FirewallRulesProperties.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/IgnoreFailedFirewallRules/IgnoreFailedFirewallRules.wixproj b/src/test/msi/TestData/FirewallExtensionTests/IgnoreFailedFirewallRules/IgnoreFailedFirewallRules.wixproj index b1770b0f..94fb85e4 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/IgnoreFailedFirewallRules/IgnoreFailedFirewallRules.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/IgnoreFailedFirewallRules/IgnoreFailedFirewallRules.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/NestedService/NestedService.wixproj b/src/test/msi/TestData/FirewallExtensionTests/NestedService/NestedService.wixproj index 4a9c9dbd..c6d041c6 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/NestedService/NestedService.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/NestedService/NestedService.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/ProtocolRules/ProtocolRules.wixproj b/src/test/msi/TestData/FirewallExtensionTests/ProtocolRules/ProtocolRules.wixproj index b1770b0f..94fb85e4 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/ProtocolRules/ProtocolRules.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/ProtocolRules/ProtocolRules.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/FirewallExtensionTests/ScopeRules/ScopeRules.wixproj b/src/test/msi/TestData/FirewallExtensionTests/ScopeRules/ScopeRules.wixproj index b1770b0f..94fb85e4 100644 --- a/src/test/msi/TestData/FirewallExtensionTests/ScopeRules/ScopeRules.wixproj +++ b/src/test/msi/TestData/FirewallExtensionTests/ScopeRules/ScopeRules.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Firewall.wixext" /> | 12 | <PackageReference Include="WixToolset.Firewall.wixext" /> |
diff --git a/src/test/msi/TestData/MsmqExtensionTests/MsmqInstall/MsmqInstall.wixproj b/src/test/msi/TestData/MsmqExtensionTests/MsmqInstall/MsmqInstall.wixproj index 41e39944..b75046c9 100644 --- a/src/test/msi/TestData/MsmqExtensionTests/MsmqInstall/MsmqInstall.wixproj +++ b/src/test/msi/TestData/MsmqExtensionTests/MsmqInstall/MsmqInstall.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Msmq.wixext" /> | 12 | <PackageReference Include="WixToolset.Msmq.wixext" /> |
diff --git a/src/test/msi/TestData/RemoveFolderExTests/RemoveFolderExTest/RemoveFolderExTest.wixproj b/src/test/msi/TestData/RemoveFolderExTests/RemoveFolderExTest/RemoveFolderExTest.wixproj index 1c71388a..f02f82f4 100644 --- a/src/test/msi/TestData/RemoveFolderExTests/RemoveFolderExTest/RemoveFolderExTest.wixproj +++ b/src/test/msi/TestData/RemoveFolderExTests/RemoveFolderExTest/RemoveFolderExTest.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/Templates/CustomActionFail.exe b/src/test/msi/TestData/Templates/CustomActionFail.exe deleted file mode 100644 index cceffe91..00000000 --- a/src/test/msi/TestData/Templates/CustomActionFail.exe +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/test/msi/TestData/Templates/Product.wxs b/src/test/msi/TestData/Templates/Product.wxs index 8fb90fed..a9edab87 100644 --- a/src/test/msi/TestData/Templates/Product.wxs +++ b/src/test/msi/TestData/Templates/Product.wxs | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | 39 | ||
| 40 | <Fragment> | 40 | <Fragment> |
| 41 | <Component Id="FileComponent" Guid="12345678-9ABC-DEF0-1234-567890000000" Directory="INSTALLFOLDER"> | 41 | <Component Id="FileComponent" Guid="12345678-9ABC-DEF0-1234-567890000000" Directory="INSTALLFOLDER"> |
| 42 | <File Id="CAFile" Name="CustomActionFail.exe" Source="$(sys.SOURCEFILEDIR)\CustomActionFail.exe" /> | 42 | <File Id="CAFile" Source="CustomActionFail.exe" /> |
| 43 | </Component> | 43 | </Component> |
| 44 | 44 | ||
| 45 | <CustomAction Id="CaFail" FileRef="CAFile" Execute="immediate" Return="check" ExeCommand="" /> | 45 | <CustomAction Id="CaFail" FileRef="CAFile" Execute="immediate" Return="check" ExeCommand="" /> |
diff --git a/src/test/msi/TestData/UIExtensionTests/LocalizedWixUI/LocalizedWixUI.wixproj b/src/test/msi/TestData/UIExtensionTests/LocalizedWixUI/LocalizedWixUI.wixproj index cb8f31bb..b8a95efe 100644 --- a/src/test/msi/TestData/UIExtensionTests/LocalizedWixUI/LocalizedWixUI.wixproj +++ b/src/test/msi/TestData/UIExtensionTests/LocalizedWixUI/LocalizedWixUI.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.UI.wixext" /> | 12 | <PackageReference Include="WixToolset.UI.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/ProductA.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/ProductA.wixproj index 3895b853..96c29c60 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/ProductA.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductA/ProductA.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/ProductAddCommentToExistingGroup.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/ProductAddCommentToExistingGroup.wixproj index 5938e525..21bfc1c6 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/ProductAddCommentToExistingGroup.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductAddCommentToExistingGroup/ProductAddCommentToExistingGroup.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/ProductCommentDelete.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/ProductCommentDelete.wixproj index 63bb2370..cc06e0b2 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/ProductCommentDelete.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentDelete/ProductCommentDelete.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/ProductCommentFail.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/ProductCommentFail.wixproj index 66f308ae..b83b65e5 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/ProductCommentFail.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductCommentFail/ProductCommentFail.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/ProductFail.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/ProductFail.wixproj index e2fe3aa8..ae630e84 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/ProductFail.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFail/ProductFail.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/ProductFailIfExists.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/ProductFailIfExists.wixproj index 9e1a836f..779d8f67 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/ProductFailIfExists.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductFailIfExists/ProductFailIfExists.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/ProductNestedGroups.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/ProductNestedGroups.wixproj index 3b2e3942..f49f3bfe 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/ProductNestedGroups.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNestedGroups/ProductNestedGroups.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/ProductNewGroupWithComment.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/ProductNewGroupWithComment.wixproj index aeac903a..2a050fd2 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/ProductNewGroupWithComment.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNewGroupWithComment/ProductNewGroupWithComment.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/ProductNonVitalUserGroup.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/ProductNonVitalUserGroup.wixproj index 8734224d..92e46dd3 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/ProductNonVitalUserGroup.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductNonVitalGroup/ProductNonVitalUserGroup.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj index e4a01a3a..c6b80835 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj b/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj index 93a56216..e8fe0593 100644 --- a/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj +++ b/src/test/msi/TestData/UtilExtensionGroupTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj index 3895b853..96c29c60 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj index 5938e525..21bfc1c6 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj index 63bb2370..cc06e0b2 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj index 66f308ae..b83b65e5 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/ProductFail.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/ProductFail.wixproj index e2fe3aa8..ae630e84 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/ProductFail.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/ProductFail.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductFailIfExists/ProductFailIfExists.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductFailIfExists/ProductFailIfExists.wixproj index 9e1a836f..779d8f67 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductFailIfExists/ProductFailIfExists.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductFailIfExists/ProductFailIfExists.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj index aeac903a..4a681f82 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | </ItemGroup> | 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> |
| 10 | </ItemGroup> | ||
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 12 | </ItemGroup> | 13 | </ItemGroup> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/ProductNonVitalUserGroup.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/ProductNonVitalUserGroup.wixproj index 8734224d..92e46dd3 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/ProductNonVitalUserGroup.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/ProductNonVitalUserGroup.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj index e4a01a3a..c6b80835 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductRestrictedDomain/ProductRestrictedDomain.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj index 93a56216..e8fe0593 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | 8 | <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> |
| 9 | <ProjectReference Include="..\..\CustomActionFail\CustomActionFail.csproj" /> | ||
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" /> | 12 | <PackageReference Include="WixToolset.Util.wixext" /> |
