diff options
Diffstat (limited to 'src/test/msi/TestData')
45 files changed, 65 insertions, 87 deletions
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln deleted file mode 100644 index d25fea76..00000000 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln +++ /dev/null | |||
| @@ -1,79 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 17 | ||
| 4 | VisualStudioVersion = 17.11.35111.106 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET3", "TestComponentNET3\TestComponentNET3.csproj", "{B4CD7ECE-7245-445B-9F04-D2952631554D}" | ||
| 7 | EndProject | ||
| 8 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET4", "TestComponentNET4\TestComponentNET4.csproj", "{EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}" | ||
| 9 | EndProject | ||
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestComponentNative", "TestComponentNative\TestComponentNative.vcxproj", "{EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}" | ||
| 11 | EndProject | ||
| 12 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET8", "TestComponentNET8\TestComponentNET8.csproj", "{EC2F6BAE-9840-4CA0-8B83-F38F635CF246}" | ||
| 13 | EndProject | ||
| 14 | Global | ||
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 16 | Debug|Any CPU = Debug|Any CPU | ||
| 17 | Debug|x64 = Debug|x64 | ||
| 18 | Debug|x86 = Debug|x86 | ||
| 19 | Release|Any CPU = Release|Any CPU | ||
| 20 | Release|x64 = Release|x64 | ||
| 21 | Release|x86 = Release|x86 | ||
| 22 | EndGlobalSection | ||
| 23 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 24 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 25 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 26 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 27 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 28 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 29 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 30 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 31 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 32 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 33 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x64.Build.0 = Release|Any CPU | ||
| 34 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 35 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x86.Build.0 = Release|Any CPU | ||
| 36 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 37 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 38 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 39 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 40 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 41 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 42 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 43 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 44 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 45 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x64.Build.0 = Release|Any CPU | ||
| 46 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 47 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x86.Build.0 = Release|Any CPU | ||
| 48 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||
| 49 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|Any CPU.Build.0 = Debug|x64 | ||
| 50 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 51 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x64.Build.0 = Debug|x64 | ||
| 52 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 53 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x86.Build.0 = Debug|Win32 | ||
| 54 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|Any CPU.ActiveCfg = Release|x64 | ||
| 55 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|Any CPU.Build.0 = Release|x64 | ||
| 56 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x64.ActiveCfg = Release|x64 | ||
| 57 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x64.Build.0 = Release|x64 | ||
| 58 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x86.ActiveCfg = Release|Win32 | ||
| 59 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x86.Build.0 = Release|Win32 | ||
| 60 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 61 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 62 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 63 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 64 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 65 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 66 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 67 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 68 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 69 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x64.Build.0 = Release|Any CPU | ||
| 70 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 71 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x86.Build.0 = Release|Any CPU | ||
| 72 | EndGlobalSection | ||
| 73 | GlobalSection(SolutionProperties) = preSolution | ||
| 74 | HideSolutionNode = FALSE | ||
| 75 | EndGlobalSection | ||
| 76 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 77 | SolutionGuid = {4C27BD28-1E2C-4414-8290-3C5C042DF148} | ||
| 78 | EndGlobalSection | ||
| 79 | EndGlobal | ||
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx new file mode 100644 index 00000000..f29f1aa2 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | <Solution> | ||
| 2 | <Configurations> | ||
| 3 | <Platform Name="Any CPU" /> | ||
| 4 | <Platform Name="x64" /> | ||
| 5 | <Platform Name="x86" /> | ||
| 6 | </Configurations> | ||
| 7 | <Project Path="TestComponentNative/TestComponentNative.vcxproj" Id="eb199fa2-f9f7-4a2f-a4d3-6689f8a18952" /> | ||
| 8 | <Project Path="TestComponentNET3/TestComponentNET3.csproj" Id="b4cd7ece-7245-445b-9f04-d2952631554d" /> | ||
| 9 | <Project Path="TestComponentNET4/TestComponentNET4.csproj" Id="ea2afcce-677d-433e-8517-4cfbbd3ebfaa" /> | ||
| 10 | <Project Path="TestComponentNET8/TestComponentNET8.csproj" /> | ||
| 11 | </Solution> | ||
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj index b0c4aff9..a71fb079 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <ProjectType>Local</ProjectType> | 4 | <ProjectType>Local</ProjectType> |
| 5 | <ProductVersion>7.0.9466</ProductVersion> | 5 | <ProductVersion>7.0.9466</ProductVersion> |
| @@ -94,4 +94,4 @@ | |||
| 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" | 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" |
| 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> | 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> |
| 96 | </PropertyGroup> | 96 | </PropertyGroup> |
| 97 | </Project> \ No newline at end of file | 97 | </Project> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj index c1398c24..5e5e2d75 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <ProjectType>Local</ProjectType> | 4 | <ProjectType>Local</ProjectType> |
| 5 | <ProductVersion>7.0.9466</ProductVersion> | 5 | <ProductVersion>7.0.9466</ProductVersion> |
| @@ -94,4 +94,4 @@ | |||
| 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" | 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" |
| 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> | 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> |
| 96 | </PropertyGroup> | 96 | </PropertyGroup> |
| 97 | </Project> \ No newline at end of file | 97 | </Project> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters index a05a6a8f..7d4d96a9 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <Filter Include="Source Files"> | 4 | <Filter Include="Source Files"> |
| 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> |
| @@ -79,4 +79,4 @@ | |||
| 79 | <Filter>Source Files</Filter> | 79 | <Filter>Source Files</Filter> |
| 80 | </Midl> | 80 | </Midl> |
| 81 | </ItemGroup> | 81 | </ItemGroup> |
| 82 | </Project> \ No newline at end of file | 82 | </Project> |
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" /> |
