aboutsummaryrefslogtreecommitdiff
path: root/src/test/msi
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/msi')
-rw-r--r--src/test/msi/MsiE2ETests.sln51
-rw-r--r--src/test/msi/MsiE2ETests.slnx9
-rw-r--r--src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln79
-rw-r--r--src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx11
-rw-r--r--src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj4
-rw-r--r--src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj4
-rw-r--r--src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters4
7 files changed, 26 insertions, 136 deletions
diff --git a/src/test/msi/MsiE2ETests.sln b/src/test/msi/MsiE2ETests.sln
deleted file mode 100644
index c8ba93ec..00000000
--- a/src/test/msi/MsiE2ETests.sln
+++ /dev/null
@@ -1,51 +0,0 @@
1
2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 17
4VisualStudioVersion = 17.0.31919.166
5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "..\burn\WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}"
7EndProject
8Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.MsiE2E", "WixToolsetTest.MsiE2E\WixToolsetTest.MsiE2E.csproj", "{68E1A5F8-0F44-4B38-8876-C101A2A019F2}"
9EndProject
10Global
11 GlobalSection(SolutionConfigurationPlatforms) = preSolution
12 Debug|Any CPU = Debug|Any CPU
13 Debug|x64 = Debug|x64
14 Debug|x86 = Debug|x86
15 Release|Any CPU = Release|Any CPU
16 Release|x64 = Release|x64
17 Release|x86 = Release|x86
18 EndGlobalSection
19 GlobalSection(ProjectConfigurationPlatforms) = postSolution
20 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
22 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.ActiveCfg = Debug|Any CPU
23 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.Build.0 = Debug|Any CPU
24 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.ActiveCfg = Debug|Any CPU
25 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.Build.0 = Debug|Any CPU
26 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.Build.0 = Release|Any CPU
28 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.ActiveCfg = Release|Any CPU
29 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.Build.0 = Release|Any CPU
30 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.ActiveCfg = Release|Any CPU
31 {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.Build.0 = Release|Any CPU
32 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
34 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x64.ActiveCfg = Debug|Any CPU
35 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x64.Build.0 = Debug|Any CPU
36 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x86.ActiveCfg = Debug|Any CPU
37 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x86.Build.0 = Debug|Any CPU
38 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
39 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|Any CPU.Build.0 = Release|Any CPU
40 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x64.ActiveCfg = Release|Any CPU
41 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x64.Build.0 = Release|Any CPU
42 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x86.ActiveCfg = Release|Any CPU
43 {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x86.Build.0 = Release|Any CPU
44 EndGlobalSection
45 GlobalSection(SolutionProperties) = preSolution
46 HideSolutionNode = FALSE
47 EndGlobalSection
48 GlobalSection(ExtensibilityGlobals) = postSolution
49 SolutionGuid = {4C9978E3-8548-451E-8BF5-03AD1D0280C2}
50 EndGlobalSection
51EndGlobal
diff --git a/src/test/msi/MsiE2ETests.slnx b/src/test/msi/MsiE2ETests.slnx
new file mode 100644
index 00000000..c2cff885
--- /dev/null
+++ b/src/test/msi/MsiE2ETests.slnx
@@ -0,0 +1,9 @@
1<Solution>
2 <Configurations>
3 <Platform Name="Any CPU" />
4 <Platform Name="x64" />
5 <Platform Name="x86" />
6 </Configurations>
7 <Project Path="../burn/WixTestTools/WixTestTools.csproj" />
8 <Project Path="WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj" />
9</Solution>
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
2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 17
4VisualStudioVersion = 17.11.35111.106
5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET3", "TestComponentNET3\TestComponentNET3.csproj", "{B4CD7ECE-7245-445B-9F04-D2952631554D}"
7EndProject
8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET4", "TestComponentNET4\TestComponentNET4.csproj", "{EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}"
9EndProject
10Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestComponentNative", "TestComponentNative\TestComponentNative.vcxproj", "{EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}"
11EndProject
12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET8", "TestComponentNET8\TestComponentNET8.csproj", "{EC2F6BAE-9840-4CA0-8B83-F38F635CF246}"
13EndProject
14Global
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
79EndGlobal
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"
95tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> 95tlbexp.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"
95tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> 95tlbexp.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>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-23 08:09:05 +0000