4 files changed, 25 insertions, 107 deletions
diff --git a/src/ext/NetFx/NetFx.wixext.sln b/src/ext/NetFx/NetFx.wixext.sln
deleted file mode 100644
index b8b72eb8..00000000
--- a/src/ext/NetFx/NetFx.wixext.sln
+++ /dev/null
@@ -1,105 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32811.315
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netcoresearch", "netcoresearch\netcoresearch.vcxproj", "{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxbe", "be\netfxbe.vcxproj", "{B65719C0-B2CC-45F9-AF33-6F147F741ADB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}"
-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
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug|Any CPU.Build.0 = Debug|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug|x64.ActiveCfg = Debug|x64
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug|x64.Build.0 = Debug|x64
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug|x86.ActiveCfg = Debug|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug|x86.Build.0 = Debug|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release|Any CPU.ActiveCfg = Release|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release|Any CPU.Build.0 = Release|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release|x64.ActiveCfg = Release|x64
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release|x64.Build.0 = Release|x64
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release|x86.ActiveCfg = Release|Win32
-                {A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release|x86.Build.0 = Release|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug|Any CPU.Build.0 = Debug|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug|x64.ActiveCfg = Debug|x64
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug|x64.Build.0 = Debug|x64
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug|x86.ActiveCfg = Debug|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug|x86.Build.0 = Debug|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release|Any CPU.ActiveCfg = Release|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release|Any CPU.Build.0 = Release|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release|x64.ActiveCfg = Release|x64
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release|x64.Build.0 = Release|x64
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release|x86.ActiveCfg = Release|Win32
-                {B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release|x86.Build.0 = Release|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|Any CPU.Build.0 = Debug|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x64.ActiveCfg = Debug|x64
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x64.Build.0 = Debug|x64
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = Debug|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.ActiveCfg = Release|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.Build.0 = Release|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|x64
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.Build.0 = Release|x64
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32
-                {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|Any CPU.ActiveCfg = Debug|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|Any CPU.Build.0 = Debug|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x64.ActiveCfg = Debug|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.ActiveCfg = Debug|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.Build.0 = Debug|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.ActiveCfg = Release|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.Build.0 = Release|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x64.ActiveCfg = Release|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.ActiveCfg = Release|x86
-                {45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.Build.0 = Release|x86
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x64.Build.0 = Debug|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug|x86.Build.0 = Debug|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|Any CPU.Build.0 = Release|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x64.ActiveCfg = Release|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x64.Build.0 = Release|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x86.ActiveCfg = Release|Any CPU
-                {F774E291-0563-4DDD-B873-F5C31683CF4B}.Release|x86.Build.0 = Release|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x64.Build.0 = Debug|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug|x86.Build.0 = Debug|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|Any CPU.Build.0 = Release|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x64.ActiveCfg = Release|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x64.Build.0 = Release|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release|x86.ActiveCfg = Release|Any CPU
-                {AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.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/NetFx/NetFx.wixext.slnx b/src/ext/NetFx/NetFx.wixext.slnx
new file mode 100644
index 00000000..9c01b2ec
--- /dev/null
+++ b/src/ext/NetFx/NetFx.wixext.slnx
@@ -0,0 +1,23 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="be/netfxbe.vcxproj" Id="b65719c0-b2cc-45f9-af33-6f147f741adb">
+    <Platform Solution="*|Any CPU" Project="Win32" />
+  </Project>
+  <Project Path="ca/netfxca.vcxproj" Id="f72d34ca-48da-4dfd-91a9-a0c78bef6981">
+    <Platform Solution="*|Any CPU" Project="Win32" />
+  </Project>
+  <Project Path="netcoresearch/netcoresearch.vcxproj" Id="a7fd9ef2-68cf-4c8e-ad81-3e8a6c7e1937">
+    <Platform Solution="*|Any CPU" Project="Win32" />
+  </Project>
+  <Project Path="test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj" />
+  <Project Path="wixext/WixToolset.Netfx.wixext.csproj" />
+  <Project Path="wixlib/netfx.wixproj">
+    <Platform Project="x86" />
+    <Build Solution="*|Any CPU" />
+    <Build Solution="*|x86" />
+  </Project>
+</Solution>
diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj
index ea9d2d90..53113693 100644
--- a/src/ext/NetFx/ca/netfxca.vcxproj
+++ b/src/ext/NetFx/ca/netfxca.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/NetFx/netcoresearch/netcoresearch.vcxproj b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
index b6e193dc..3744d7ee 100644
--- a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
+++ b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
@@ -1,6 +1,6 @@
 <?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|ARM64">
      <Configuration>Debug</Configuration>

diff --git a/src/ext/NetFx/NetFx.wixext.sln b/src/ext/NetFx/NetFx.wixext.sln deleted file mode 100644 index b8b72eb8..00000000 --- a/src/ext/NetFx/NetFx.wixext.sln +++ /dev/null
@@ -1,105 +0,0 @@
1
2	Microsoft Visual Studio Solution File, Format Version 12.00
3	# Visual Studio Version 17
4	VisualStudioVersion = 17.3.32811.315
5	MinimumVisualStudioVersion = 15.0.26124.0
6	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netcoresearch", "netcoresearch\netcoresearch.vcxproj", "{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}"
7	EndProject
8	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxbe", "be\netfxbe.vcxproj", "{B65719C0-B2CC-45F9-AF33-6F147F741ADB}"
9	EndProject
10	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}"
11	EndProject
12	Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}"
13	EndProject
14	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}"
15	EndProject
16	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}"
17	EndProject
18	Global
19	GlobalSection(SolutionConfigurationPlatforms) = preSolution
20	Debug\|Any CPU = Debug\|Any CPU
21	Debug\|x64 = Debug\|x64
22	Debug\|x86 = Debug\|x86
23	Release\|Any CPU = Release\|Any CPU
24	Release\|x64 = Release\|x64
25	Release\|x86 = Release\|x86
26	EndGlobalSection
27	GlobalSection(ProjectConfigurationPlatforms) = postSolution
28	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
29	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug\|Any CPU.Build.0 = Debug\|Win32
30	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug\|x64.ActiveCfg = Debug\|x64
31	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug\|x64.Build.0 = Debug\|x64
32	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug\|x86.ActiveCfg = Debug\|Win32
33	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Debug\|x86.Build.0 = Debug\|Win32
34	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release\|Any CPU.ActiveCfg = Release\|Win32
35	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release\|Any CPU.Build.0 = Release\|Win32
36	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release\|x64.ActiveCfg = Release\|x64
37	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release\|x64.Build.0 = Release\|x64
38	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release\|x86.ActiveCfg = Release\|Win32
39	{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}.Release\|x86.Build.0 = Release\|Win32
40	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
41	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug\|Any CPU.Build.0 = Debug\|Win32
42	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug\|x64.ActiveCfg = Debug\|x64
43	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug\|x64.Build.0 = Debug\|x64
44	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug\|x86.ActiveCfg = Debug\|Win32
45	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Debug\|x86.Build.0 = Debug\|Win32
46	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release\|Any CPU.ActiveCfg = Release\|Win32
47	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release\|Any CPU.Build.0 = Release\|Win32
48	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release\|x64.ActiveCfg = Release\|x64
49	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release\|x64.Build.0 = Release\|x64
50	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release\|x86.ActiveCfg = Release\|Win32
51	{B65719C0-B2CC-45F9-AF33-6F147F741ADB}.Release\|x86.Build.0 = Release\|Win32
52	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug\|Any CPU.ActiveCfg = Debug\|Win32
53	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug\|Any CPU.Build.0 = Debug\|Win32
54	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug\|x64.ActiveCfg = Debug\|x64
55	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug\|x64.Build.0 = Debug\|x64
56	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug\|x86.ActiveCfg = Debug\|Win32
57	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug\|x86.Build.0 = Debug\|Win32
58	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release\|Any CPU.ActiveCfg = Release\|Win32
59	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release\|Any CPU.Build.0 = Release\|Win32
60	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release\|x64.ActiveCfg = Release\|x64
61	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release\|x64.Build.0 = Release\|x64
62	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release\|x86.ActiveCfg = Release\|Win32
63	{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release\|x86.Build.0 = Release\|Win32
64	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug\|Any CPU.ActiveCfg = Debug\|x86
65	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug\|Any CPU.Build.0 = Debug\|x86
66	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug\|x64.ActiveCfg = Debug\|x86
67	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug\|x86.ActiveCfg = Debug\|x86
68	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug\|x86.Build.0 = Debug\|x86
69	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release\|Any CPU.ActiveCfg = Release\|x86
70	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release\|Any CPU.Build.0 = Release\|x86
71	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release\|x64.ActiveCfg = Release\|x86
72	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release\|x86.ActiveCfg = Release\|x86
73	{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release\|x86.Build.0 = Release\|x86
74	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
75	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
76	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug\|x64.ActiveCfg = Debug\|Any CPU
77	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug\|x64.Build.0 = Debug\|Any CPU
78	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug\|x86.ActiveCfg = Debug\|Any CPU
79	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Debug\|x86.Build.0 = Debug\|Any CPU
80	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
81	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Release\|Any CPU.Build.0 = Release\|Any CPU
82	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Release\|x64.ActiveCfg = Release\|Any CPU
83	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Release\|x64.Build.0 = Release\|Any CPU
84	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Release\|x86.ActiveCfg = Release\|Any CPU
85	{F774E291-0563-4DDD-B873-F5C31683CF4B}.Release\|x86.Build.0 = Release\|Any CPU
86	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
87	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
88	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug\|x64.ActiveCfg = Debug\|Any CPU
89	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug\|x64.Build.0 = Debug\|Any CPU
90	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug\|x86.ActiveCfg = Debug\|Any CPU
91	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Debug\|x86.Build.0 = Debug\|Any CPU
92	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
93	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release\|Any CPU.Build.0 = Release\|Any CPU
94	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release\|x64.ActiveCfg = Release\|Any CPU
95	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release\|x64.Build.0 = Release\|Any CPU
96	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release\|x86.ActiveCfg = Release\|Any CPU
97	{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}.Release\|x86.Build.0 = Release\|Any CPU
98	EndGlobalSection
99	GlobalSection(SolutionProperties) = preSolution
100	HideSolutionNode = FALSE
101	EndGlobalSection
102	GlobalSection(ExtensibilityGlobals) = postSolution
103	SolutionGuid = {E4566A6B-47D0-4EA0-989A-D763AC39105D}
104	EndGlobalSection
105	EndGlobal


diff --git a/src/ext/NetFx/NetFx.wixext.slnx b/src/ext/NetFx/NetFx.wixext.slnx new file mode 100644 index 00000000..9c01b2ec --- /dev/null +++ b/src/ext/NetFx/NetFx.wixext.slnx
@@ -0,0 +1,23 @@
		1	<Solution>
		2	<Configurations>
		3	<Platform Name="Any CPU" />
		4	<Platform Name="x64" />
		5	<Platform Name="x86" />
		6	</Configurations>
		7	<Project Path="be/netfxbe.vcxproj" Id="b65719c0-b2cc-45f9-af33-6f147f741adb">
		8	<Platform Solution="*\|Any CPU" Project="Win32" />
		9	</Project>
		10	<Project Path="ca/netfxca.vcxproj" Id="f72d34ca-48da-4dfd-91a9-a0c78bef6981">
		11	<Platform Solution="*\|Any CPU" Project="Win32" />
		12	</Project>
		13	<Project Path="netcoresearch/netcoresearch.vcxproj" Id="a7fd9ef2-68cf-4c8e-ad81-3e8a6c7e1937">
		14	<Platform Solution="*\|Any CPU" Project="Win32" />
		15	</Project>
		16	<Project Path="test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj" />
		17	<Project Path="wixext/WixToolset.Netfx.wixext.csproj" />
		18	<Project Path="wixlib/netfx.wixproj">
		19	<Platform Project="x86" />
		20	<Build Solution="*\|Any CPU" />
		21	<Build Solution="*\|x86" />
		22	</Project>
		23	</Solution>


diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index ea9d2d90..53113693 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.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>


diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj index b6e193dc..3744d7ee 100644 --- a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj +++ b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
@@ -1,6 +1,6 @@
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	<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	3	<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4	<ItemGroup Label="ProjectConfigurations">	4	<ItemGroup Label="ProjectConfigurations">
5	<ProjectConfiguration Include="Debug\|ARM64">	5	<ProjectConfiguration Include="Debug\|ARM64">
6	<Configuration>Debug</Configuration>	6	<Configuration>Debug</Configuration>