2 files changed, 22 insertions, 87 deletions
diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln
deleted file mode 100644
index 0168dab9..00000000
--- a/src/ext/Util/Util.wixext.sln
+++ /dev/null
@@ -1,87 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32228.430
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Debug|x64 = Debug|x64
-                Debug|x86 = Debug|x86
-                Release|Any CPU = Release|Any CPU
-                Release|x64 = Release|x64
-                Release|x86 = Release|x86
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|Any CPU.Build.0 = Debug|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x64.ActiveCfg = Debug|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.ActiveCfg = Debug|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug|x86.Build.0 = Debug|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.ActiveCfg = Release|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|Any CPU.Build.0 = Release|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x64.ActiveCfg = Release|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.ActiveCfg = Release|Win32
-                {630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release|x86.Build.0 = Release|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.Build.0 = Debug|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x64.ActiveCfg = Debug|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.ActiveCfg = Release|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|Any CPU.Build.0 = Release|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x64.ActiveCfg = Release|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32
-                {076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.ActiveCfg = Debug|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.Build.0 = Debug|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86
-                {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x64.Build.0 = Debug|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|x86.Build.0 = Debug|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|Any CPU.Build.0 = Release|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x64.ActiveCfg = Release|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x64.Build.0 = Release|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x86.ActiveCfg = Release|Any CPU
-                {6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release|x86.Build.0 = Release|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x64.Build.0 = Debug|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug|x86.Build.0 = Debug|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|Any CPU.Build.0 = Release|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x64.ActiveCfg = Release|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x64.Build.0 = Release|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x86.ActiveCfg = Release|Any CPU
-                {D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release|x86.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {E4566A6B-47D0-4EA0-989A-D763AC39105D}
-        EndGlobalSection
-EndGlobal
diff --git a/src/ext/Util/Util.wixext.slnx b/src/ext/Util/Util.wixext.slnx
new file mode 100644
index 00000000..737fba27
--- /dev/null
+++ b/src/ext/Util/Util.wixext.slnx
@@ -0,0 +1,22 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="be/utilbe.vcxproj" Id="630c1ee7-2517-4a8c-83e3-da1150308b58">
+    <Platform Project="Win32" />
+    <Build Solution="*|x64" Project="false" />
+  </Project>
+  <Project Path="ca/utilca.vcxproj" Id="076018f7-19bd-423a-abbf-229273da08d8">
+    <Platform Project="Win32" />
+    <Build Solution="*|x64" Project="false" />
+  </Project>
+  <Project Path="test/WixToolsetTest.Util/WixToolsetTest.Util.csproj" />
+  <Project Path="wixext/WixToolset.Util.wixext.csproj" />
+  <Project Path="wixlib/util.wixproj">
+    <Platform Project="x86" />
+    <Build Solution="*|Any CPU" />
+    <Build Solution="*|x86" />
+  </Project>
+</Solution>

diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln deleted file mode 100644 index 0168dab9..00000000 --- a/src/ext/Util/Util.wixext.sln +++ /dev/null
@@ -1,87 +0,0 @@
1
2	Microsoft Visual Studio Solution File, Format Version 12.00
3	# Visual Studio Version 17
4	VisualStudioVersion = 17.1.32228.430
5	MinimumVisualStudioVersion = 15.0.26124.0
6	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}"
7	EndProject
8	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}"
9	EndProject
10	Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}"
11	EndProject
12	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}"
13	EndProject
14	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}"
15	EndProject
16	Global
17	GlobalSection(SolutionConfigurationPlatforms) = preSolution
18	Debug\|Any CPU = Debug\|Any CPU
19	Debug\|x64 = Debug\|x64
20	Debug\|x86 = Debug\|x86
21	Release\|Any CPU = Release\|Any CPU
22	Release\|x64 = Release\|x64
23	Release\|x86 = Release\|x86
24	EndGlobalSection
25	GlobalSection(ProjectConfigurationPlatforms) = postSolution
26	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
27	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug\|Any CPU.Build.0 = Debug\|Win32
28	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug\|x64.ActiveCfg = Debug\|Win32
29	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug\|x86.ActiveCfg = Debug\|Win32
30	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Debug\|x86.Build.0 = Debug\|Win32
31	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release\|Any CPU.ActiveCfg = Release\|Win32
32	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release\|Any CPU.Build.0 = Release\|Win32
33	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release\|x64.ActiveCfg = Release\|Win32
34	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release\|x86.ActiveCfg = Release\|Win32
35	{630C1EE7-2517-4A8C-83E3-DA1150308B58}.Release\|x86.Build.0 = Release\|Win32
36	{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
37	{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug\|Any CPU.Build.0 = Debug\|Win32
38	{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug\|x64.ActiveCfg = Debug\|Win32
39	{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug\|x86.ActiveCfg = Debug\|Win32
40	{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug\|x86.Build.0 = Debug\|Win32
41	{076018F7-19BD-423A-ABBF-229273DA08D8}.Release\|Any CPU.ActiveCfg = Release\|Win32
42	{076018F7-19BD-423A-ABBF-229273DA08D8}.Release\|Any CPU.Build.0 = Release\|Win32
43	{076018F7-19BD-423A-ABBF-229273DA08D8}.Release\|x64.ActiveCfg = Release\|Win32
44	{076018F7-19BD-423A-ABBF-229273DA08D8}.Release\|x86.ActiveCfg = Release\|Win32
45	{076018F7-19BD-423A-ABBF-229273DA08D8}.Release\|x86.Build.0 = Release\|Win32
46	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug\|Any CPU.ActiveCfg = Debug\|x86
47	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug\|Any CPU.Build.0 = Debug\|x86
48	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug\|x64.ActiveCfg = Debug\|x86
49	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug\|x86.ActiveCfg = Debug\|x86
50	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug\|x86.Build.0 = Debug\|x86
51	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release\|Any CPU.ActiveCfg = Release\|x86
52	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release\|Any CPU.Build.0 = Release\|x86
53	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release\|x64.ActiveCfg = Release\|x86
54	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release\|x86.ActiveCfg = Release\|x86
55	{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release\|x86.Build.0 = Release\|x86
56	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
57	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
58	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug\|x64.ActiveCfg = Debug\|Any CPU
59	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug\|x64.Build.0 = Debug\|Any CPU
60	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug\|x86.ActiveCfg = Debug\|Any CPU
61	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug\|x86.Build.0 = Debug\|Any CPU
62	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
63	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release\|Any CPU.Build.0 = Release\|Any CPU
64	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release\|x64.ActiveCfg = Release\|Any CPU
65	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release\|x64.Build.0 = Release\|Any CPU
66	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release\|x86.ActiveCfg = Release\|Any CPU
67	{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Release\|x86.Build.0 = Release\|Any CPU
68	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
69	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
70	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug\|x64.ActiveCfg = Debug\|Any CPU
71	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug\|x64.Build.0 = Debug\|Any CPU
72	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug\|x86.ActiveCfg = Debug\|Any CPU
73	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Debug\|x86.Build.0 = Debug\|Any CPU
74	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
75	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release\|Any CPU.Build.0 = Release\|Any CPU
76	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release\|x64.ActiveCfg = Release\|Any CPU
77	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release\|x64.Build.0 = Release\|Any CPU
78	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release\|x86.ActiveCfg = Release\|Any CPU
79	{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}.Release\|x86.Build.0 = Release\|Any CPU
80	EndGlobalSection
81	GlobalSection(SolutionProperties) = preSolution
82	HideSolutionNode = FALSE
83	EndGlobalSection
84	GlobalSection(ExtensibilityGlobals) = postSolution
85	SolutionGuid = {E4566A6B-47D0-4EA0-989A-D763AC39105D}
86	EndGlobalSection
87	EndGlobal


diff --git a/src/ext/Util/Util.wixext.slnx b/src/ext/Util/Util.wixext.slnx new file mode 100644 index 00000000..737fba27 --- /dev/null +++ b/src/ext/Util/Util.wixext.slnx
@@ -0,0 +1,22 @@
		1	<Solution>
		2	<Configurations>
		3	<Platform Name="Any CPU" />
		4	<Platform Name="x64" />
		5	<Platform Name="x86" />
		6	</Configurations>
		7	<Project Path="be/utilbe.vcxproj" Id="630c1ee7-2517-4a8c-83e3-da1150308b58">
		8	<Platform Project="Win32" />
		9	<Build Solution="*\|x64" Project="false" />
		10	</Project>
		11	<Project Path="ca/utilca.vcxproj" Id="076018f7-19bd-423a-abbf-229273da08d8">
		12	<Platform Project="Win32" />
		13	<Build Solution="*\|x64" Project="false" />
		14	</Project>
		15	<Project Path="test/WixToolsetTest.Util/WixToolsetTest.Util.csproj" />
		16	<Project Path="wixext/WixToolset.Util.wixext.csproj" />
		17	<Project Path="wixlib/util.wixproj">
		18	<Platform Project="x86" />
		19	<Build Solution="*\|Any CPU" />
		20	<Build Solution="*\|x86" />
		21	</Project>
		22	</Solution>