3 files changed, 16 insertions, 62 deletions
diff --git a/src/ext/DirectX/DirectX.wixext.sln b/src/ext/DirectX/DirectX.wixext.sln
deleted file mode 100644
index 6315616a..00000000
--- a/src/ext/DirectX/DirectX.wixext.sln
+++ /dev/null
@@ -1,61 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30204.135
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|Any CPU = Debug|Any CPU
-                Debug|x86 = Debug|x86
-                Release|Any CPU = Release|Any CPU
-                Release|x86 = Release|x86
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|Any CPU.Build.0 = Debug|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|x86.ActiveCfg = Debug|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug|x86.Build.0 = Debug|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|Any CPU.ActiveCfg = Release|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|Any CPU.Build.0 = Release|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|x86.ActiveCfg = Release|Win32
-                {76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release|x86.Build.0 = Release|Win32
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|Any CPU.ActiveCfg = Debug|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|Any CPU.Build.0 = Debug|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|x86.ActiveCfg = Debug|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug|x86.Build.0 = Debug|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|Any CPU.ActiveCfg = Release|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|Any CPU.Build.0 = Release|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|x86.ActiveCfg = Release|x86
-                {4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release|x86.Build.0 = Release|x86
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Debug|x86.Build.0 = Debug|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|Any CPU.Build.0 = Release|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|x86.ActiveCfg = Release|Any CPU
-                {6182DBCA-146A-4F37-8406-3139BBE04636}.Release|x86.Build.0 = Release|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug|x86.Build.0 = Debug|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|Any CPU.Build.0 = Release|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|x86.ActiveCfg = Release|Any CPU
-                {508A3DD0-FE58-4150-A1F6-A803A377012A}.Release|x86.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {A32D323A-3843-410E-BB3A-A97ABA6E4107}
-        EndGlobalSection
-EndGlobal
diff --git a/src/ext/DirectX/DirectX.wixext.slnx b/src/ext/DirectX/DirectX.wixext.slnx
new file mode 100644
index 00000000..f2cb74b2
--- /dev/null
+++ b/src/ext/DirectX/DirectX.wixext.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="ca/directxca.vcxproj" Id="76542b28-0ffd-47d3-ad6a-d0f20fa875ac">
+    <Platform Project="Win32" />
+  </Project>
+  <Project Path="test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj" />
+  <Project Path="wixext/WixToolset.DirectX.wixext.csproj" />
+  <Project Path="wixlib/directx.wixproj">
+    <Platform Project="x86" />
+    <Build />
+  </Project>
+</Solution>
diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj
index 00b4fcb0..a138109f 100644
--- a/src/ext/DirectX/ca/directxca.vcxproj
+++ b/src/ext/DirectX/ca/directxca.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>

diff --git a/src/ext/DirectX/DirectX.wixext.sln b/src/ext/DirectX/DirectX.wixext.sln deleted file mode 100644 index 6315616a..00000000 --- a/src/ext/DirectX/DirectX.wixext.sln +++ /dev/null
@@ -1,61 +0,0 @@
1
2	Microsoft Visual Studio Solution File, Format Version 12.00
3	# Visual Studio Version 16
4	VisualStudioVersion = 16.0.30204.135
5	MinimumVisualStudioVersion = 10.0.40219.1
6	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}"
7	EndProject
8	Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}"
9	EndProject
10	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}"
11	EndProject
12	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}"
13	EndProject
14	Global
15	GlobalSection(SolutionConfigurationPlatforms) = preSolution
16	Debug\|Any CPU = Debug\|Any CPU
17	Debug\|x86 = Debug\|x86
18	Release\|Any CPU = Release\|Any CPU
19	Release\|x86 = Release\|x86
20	EndGlobalSection
21	GlobalSection(ProjectConfigurationPlatforms) = postSolution
22	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
23	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug\|Any CPU.Build.0 = Debug\|Win32
24	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug\|x86.ActiveCfg = Debug\|Win32
25	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Debug\|x86.Build.0 = Debug\|Win32
26	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release\|Any CPU.ActiveCfg = Release\|Win32
27	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release\|Any CPU.Build.0 = Release\|Win32
28	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release\|x86.ActiveCfg = Release\|Win32
29	{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}.Release\|x86.Build.0 = Release\|Win32
30	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug\|Any CPU.ActiveCfg = Debug\|x86
31	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug\|Any CPU.Build.0 = Debug\|x86
32	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug\|x86.ActiveCfg = Debug\|x86
33	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Debug\|x86.Build.0 = Debug\|x86
34	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release\|Any CPU.ActiveCfg = Release\|x86
35	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release\|Any CPU.Build.0 = Release\|x86
36	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release\|x86.ActiveCfg = Release\|x86
37	{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}.Release\|x86.Build.0 = Release\|x86
38	{6182DBCA-146A-4F37-8406-3139BBE04636}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
39	{6182DBCA-146A-4F37-8406-3139BBE04636}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
40	{6182DBCA-146A-4F37-8406-3139BBE04636}.Debug\|x86.ActiveCfg = Debug\|Any CPU
41	{6182DBCA-146A-4F37-8406-3139BBE04636}.Debug\|x86.Build.0 = Debug\|Any CPU
42	{6182DBCA-146A-4F37-8406-3139BBE04636}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
43	{6182DBCA-146A-4F37-8406-3139BBE04636}.Release\|Any CPU.Build.0 = Release\|Any CPU
44	{6182DBCA-146A-4F37-8406-3139BBE04636}.Release\|x86.ActiveCfg = Release\|Any CPU
45	{6182DBCA-146A-4F37-8406-3139BBE04636}.Release\|x86.Build.0 = Release\|Any CPU
46	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
47	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
48	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug\|x86.ActiveCfg = Debug\|Any CPU
49	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Debug\|x86.Build.0 = Debug\|Any CPU
50	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
51	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Release\|Any CPU.Build.0 = Release\|Any CPU
52	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Release\|x86.ActiveCfg = Release\|Any CPU
53	{508A3DD0-FE58-4150-A1F6-A803A377012A}.Release\|x86.Build.0 = Release\|Any CPU
54	EndGlobalSection
55	GlobalSection(SolutionProperties) = preSolution
56	HideSolutionNode = FALSE
57	EndGlobalSection
58	GlobalSection(ExtensibilityGlobals) = postSolution
59	SolutionGuid = {A32D323A-3843-410E-BB3A-A97ABA6E4107}
60	EndGlobalSection
61	EndGlobal


diff --git a/src/ext/DirectX/DirectX.wixext.slnx b/src/ext/DirectX/DirectX.wixext.slnx new file mode 100644 index 00000000..f2cb74b2 --- /dev/null +++ b/src/ext/DirectX/DirectX.wixext.slnx
@@ -0,0 +1,15 @@
		1	<Solution>
		2	<Configurations>
		3	<Platform Name="Any CPU" />
		4	<Platform Name="x86" />
		5	</Configurations>
		6	<Project Path="ca/directxca.vcxproj" Id="76542b28-0ffd-47d3-ad6a-d0f20fa875ac">
		7	<Platform Project="Win32" />
		8	</Project>
		9	<Project Path="test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj" />
		10	<Project Path="wixext/WixToolset.DirectX.wixext.csproj" />
		11	<Project Path="wixlib/directx.wixproj">
		12	<Platform Project="x86" />
		13	<Build />
		14	</Project>
		15	</Solution>


diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index 00b4fcb0..a138109f 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj
@@ -1,7 +1,7 @@
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<!-- 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	<!-- 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. -->
3		3
4	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	4	<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5	<ItemGroup Label="ProjectConfigurations">	5	<ItemGroup Label="ProjectConfigurations">
6	<ProjectConfiguration Include="Debug\|Win32">	6	<ProjectConfiguration Include="Debug\|Win32">
7	<Configuration>Debug</Configuration>	7	<Configuration>Debug</Configuration>