3 files changed, 16 insertions, 62 deletions
diff --git a/src/ext/Sql/Sql.wixext.sln b/src/ext/Sql/Sql.wixext.sln
deleted file mode 100644
index 6a2a132a..00000000
--- a/src/ext/Sql/Sql.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}") = "sqlca", "ca\sqlca.vcxproj", "{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "sql", "wixlib\sql.wixproj", "{9ACF1A20-D801-45CC-A463-F9D13E506AA3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sql.wixext", "wixext\WixToolset.Sql.wixext.csproj", "{0E05519A-0045-4AEC-BD0C-D9205FF1468F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sql", "test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj", "{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}"
-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
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|Any CPU.Build.0 = Debug|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.ActiveCfg = Debug|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.Build.0 = Debug|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|Any CPU.ActiveCfg = Release|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|Any CPU.Build.0 = Release|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.ActiveCfg = Release|Win32
-                {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.Build.0 = Release|Win32
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|Any CPU.ActiveCfg = Debug|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|Any CPU.Build.0 = Debug|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.ActiveCfg = Debug|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.Build.0 = Debug|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.ActiveCfg = Release|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.Build.0 = Release|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.ActiveCfg = Release|x86
-                {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.Build.0 = Release|x86
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|x86.Build.0 = Debug|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release|Any CPU.Build.0 = Release|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release|x86.ActiveCfg = Release|Any CPU
-                {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release|x86.Build.0 = Release|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug|x86.Build.0 = Debug|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release|Any CPU.Build.0 = Release|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release|x86.ActiveCfg = Release|Any CPU
-                {FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release|x86.Build.0 = Release|Any CPU
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {DEFEE3BB-E557-4B77-A85C-ECA19D6F5DF5}
-        EndGlobalSection
-EndGlobal
diff --git a/src/ext/Sql/Sql.wixext.slnx b/src/ext/Sql/Sql.wixext.slnx
new file mode 100644
index 00000000..ec141cdb
--- /dev/null
+++ b/src/ext/Sql/Sql.wixext.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="ca/sqlca.vcxproj" Id="4dca6e4b-a1f1-4450-bc2d-94ac20f31935">
+    <Platform Project="Win32" />
+  </Project>
+  <Project Path="test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj" />
+  <Project Path="wixext/WixToolset.Sql.wixext.csproj" />
+  <Project Path="wixlib/sql.wixproj">
+    <Platform Project="x86" />
+    <Build />
+  </Project>
+</Solution>
diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj
index 4013351f..38ed4c8e 100644
--- a/src/ext/Sql/ca/sqlca.vcxproj
+++ b/src/ext/Sql/ca/sqlca.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="16.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/Sql/Sql.wixext.sln b/src/ext/Sql/Sql.wixext.sln deleted file mode 100644 index 6a2a132a..00000000 --- a/src/ext/Sql/Sql.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}") = "sqlca", "ca\sqlca.vcxproj", "{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}"
7	EndProject
8	Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "sql", "wixlib\sql.wixproj", "{9ACF1A20-D801-45CC-A463-F9D13E506AA3}"
9	EndProject
10	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sql.wixext", "wixext\WixToolset.Sql.wixext.csproj", "{0E05519A-0045-4AEC-BD0C-D9205FF1468F}"
11	EndProject
12	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sql", "test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj", "{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}"
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	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
23	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug\|Any CPU.Build.0 = Debug\|Win32
24	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug\|x86.ActiveCfg = Debug\|Win32
25	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug\|x86.Build.0 = Debug\|Win32
26	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release\|Any CPU.ActiveCfg = Release\|Win32
27	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release\|Any CPU.Build.0 = Release\|Win32
28	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release\|x86.ActiveCfg = Release\|Win32
29	{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release\|x86.Build.0 = Release\|Win32
30	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug\|Any CPU.ActiveCfg = Debug\|x86
31	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug\|Any CPU.Build.0 = Debug\|x86
32	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug\|x86.ActiveCfg = Debug\|x86
33	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug\|x86.Build.0 = Debug\|x86
34	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release\|Any CPU.ActiveCfg = Release\|x86
35	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release\|Any CPU.Build.0 = Release\|x86
36	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release\|x86.ActiveCfg = Release\|x86
37	{9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release\|x86.Build.0 = Release\|x86
38	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
39	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
40	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug\|x86.ActiveCfg = Debug\|Any CPU
41	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug\|x86.Build.0 = Debug\|Any CPU
42	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
43	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release\|Any CPU.Build.0 = Release\|Any CPU
44	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release\|x86.ActiveCfg = Release\|Any CPU
45	{0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Release\|x86.Build.0 = Release\|Any CPU
46	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
47	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
48	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug\|x86.ActiveCfg = Debug\|Any CPU
49	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Debug\|x86.Build.0 = Debug\|Any CPU
50	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
51	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release\|Any CPU.Build.0 = Release\|Any CPU
52	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release\|x86.ActiveCfg = Release\|Any CPU
53	{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}.Release\|x86.Build.0 = Release\|Any CPU
54	EndGlobalSection
55	GlobalSection(SolutionProperties) = preSolution
56	HideSolutionNode = FALSE
57	EndGlobalSection
58	GlobalSection(ExtensibilityGlobals) = postSolution
59	SolutionGuid = {DEFEE3BB-E557-4B77-A85C-ECA19D6F5DF5}
60	EndGlobalSection
61	EndGlobal


diff --git a/src/ext/Sql/Sql.wixext.slnx b/src/ext/Sql/Sql.wixext.slnx new file mode 100644 index 00000000..ec141cdb --- /dev/null +++ b/src/ext/Sql/Sql.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/sqlca.vcxproj" Id="4dca6e4b-a1f1-4450-bc2d-94ac20f31935">
		7	<Platform Project="Win32" />
		8	</Project>
		9	<Project Path="test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj" />
		10	<Project Path="wixext/WixToolset.Sql.wixext.csproj" />
		11	<Project Path="wixlib/sql.wixproj">
		12	<Platform Project="x86" />
		13	<Build />
		14	</Project>
		15	</Solution>


diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index 4013351f..38ed4c8e 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.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="16.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>