103 files changed, 200 insertions, 0 deletions

diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 00000000..1d72e683
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,37 @@
+# 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.
+#
+#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig
+#  then update all of the repos.
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{cs,vb}]
+dotnet_sort_system_directives_first = true
+
+[*.cs]
+csharp_indent_case_contents = true : error
+csharp_indent_switch_labels = true : error
+csharp_new_line_before_open_brace = all
+csharp_prefer_braces = true : error
+csharp_style_expression_bodied_methods = when_on_single_line : suggestion
+csharp_style_expression_bodied_constructors = when_on_single_line : suggestion
+csharp_style_expression_bodied_operators = when_on_single_line : suggestion
+csharp_style_expression_bodied_properties = when_on_single_line : suggestion
+csharp_style_expression_bodied_indexers = when_on_single_line : suggestion
+csharp_style_expression_bodied_accessors = when_on_single_line : suggestion
+csharp_style_var_elsewhere = true : suggestion
+csharp_style_var_for_built_in_types = true : suggestion
+csharp_style_var_when_type_is_apparent = true : suggestion
+dotnet_style_qualification_for_event = true : error
+dotnet_style_qualification_for_field = true : error
+dotnet_style_qualification_for_method = true : error
+dotnet_style_qualification_for_property = true : error
+
+[*.targets]
+indent_size = 2
diff --git a/src/CSharp.Build.props b/src/ext/ComPlus/CSharp.Build.props
index b12f4c6e..b12f4c6e 100644
--- a/src/CSharp.Build.props
+++ b/src/ext/ComPlus/CSharp.Build.props
diff --git a/src/ext/ComPlus/ComPlus.wixext.sln b/src/ext/ComPlus/ComPlus.wixext.sln
new file mode 100644
index 00000000..9fab25f2
--- /dev/null
+++ b/src/ext/ComPlus/ComPlus.wixext.sln
@@ -0,0 +1,64 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30611.23
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "src\ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "complus", "src\wixlib\complus.wixproj", "{E191E61E-E098-4F71-888F-51A79F952022}"
+        ProjectSection(ProjectDependencies) = postProject
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A} = {BDEF51ED-E242-4FA2-801A-01B127DF851A}
+        EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.ComPlus.wixext", "src\wixext\WixToolset.ComPlus.wixext.csproj", "{1497B777-330B-4CFE-927A-22850CD24D64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ComPlus", "src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj", "{2FC5F039-EACF-428B-BA87-8CDE1D25E121}"
+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
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Debug|Any CPU.Build.0 = Debug|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Debug|x86.ActiveCfg = Debug|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Debug|x86.Build.0 = Debug|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Release|Any CPU.ActiveCfg = Release|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Release|Any CPU.Build.0 = Release|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Release|x86.ActiveCfg = Release|Win32
+                {BDEF51ED-E242-4FA2-801A-01B127DF851A}.Release|x86.Build.0 = Release|Win32
+                {E191E61E-E098-4F71-888F-51A79F952022}.Debug|Any CPU.ActiveCfg = Debug|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Debug|Any CPU.Build.0 = Debug|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Debug|x86.ActiveCfg = Debug|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Debug|x86.Build.0 = Debug|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Release|Any CPU.ActiveCfg = Release|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Release|Any CPU.Build.0 = Release|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Release|x86.ActiveCfg = Release|x86
+                {E191E61E-E098-4F71-888F-51A79F952022}.Release|x86.Build.0 = Release|x86
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Debug|x86.Build.0 = Debug|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Release|x86.ActiveCfg = Release|Any CPU
+                {1497B777-330B-4CFE-927A-22850CD24D64}.Release|x86.Build.0 = Release|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Debug|x86.Build.0 = Debug|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Release|x86.ActiveCfg = Release|Any CPU
+                {2FC5F039-EACF-428B-BA87-8CDE1D25E121}.Release|x86.Build.0 = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {3E1857C4-5EE1-4C9E-9390-9954E041546D}
+        EndGlobalSection
+EndGlobal
diff --git a/src/Cpp.Build.props b/src/ext/ComPlus/Cpp.Build.props
index 9551e76f..9551e76f 100644
--- a/src/Cpp.Build.props
+++ b/src/ext/ComPlus/Cpp.Build.props
diff --git a/src/Directory.Build.props b/src/ext/ComPlus/Directory.Build.props
index b3c6287c..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/ext/ComPlus/Directory.Build.props
diff --git a/src/Directory.Build.targets b/src/ext/ComPlus/Directory.Build.targets
index 2fcc765a..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/ext/ComPlus/Directory.Build.targets
diff --git a/src/Directory.csproj.props b/src/ext/ComPlus/Directory.csproj.props
index 81d24ad1..81d24ad1 100644
--- a/src/Directory.csproj.props
+++ b/src/ext/ComPlus/Directory.csproj.props
diff --git a/src/Directory.csproj.targets b/src/ext/ComPlus/Directory.csproj.targets
index c3270426..c3270426 100644
--- a/src/Directory.csproj.targets
+++ b/src/ext/ComPlus/Directory.csproj.targets
diff --git a/src/Directory.vcxproj.props b/src/ext/ComPlus/Directory.vcxproj.props
index 664bc1d8..664bc1d8 100644
--- a/src/Directory.vcxproj.props
+++ b/src/ext/ComPlus/Directory.vcxproj.props
diff --git a/src/ext/ComPlus/README.md b/src/ext/ComPlus/README.md
new file mode 100644
index 00000000..8604c104
--- /dev/null
+++ b/src/ext/ComPlus/README.md
@@ -0,0 +1,2 @@
+# ComPlus.wixext
+WixToolset.ComPlus.wixext - COM+ WiX Toolset Extension
diff --git a/src/Wix.Build.props b/src/ext/ComPlus/Wix.Build.props
index a81c9615..a81c9615 100644
--- a/src/Wix.Build.props
+++ b/src/ext/ComPlus/Wix.Build.props
diff --git a/src/ext/ComPlus/appveyor.cmd b/src/ext/ComPlus/appveyor.cmd
new file mode 100644
index 00000000..17900d31
--- /dev/null
+++ b/src/ext/ComPlus/appveyor.cmd
@@ -0,0 +1,22 @@
+@setlocal
+@pushd %~dp0
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
+
+:: Restore
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
+
+::msbuild -p:Configuration=%_C% -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b
+::msbuild -p:Configuration=%_C% -p:Platform=x64 src\ca\complusca.vcxproj || exit /b
+
+:: Build
+msbuild -p:Configuration=%_C% src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b
+
+:: Test
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.ComPlus || exit /b
+
+:: Pack
+msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj || exit /b
+
+@popd
+@endlocal
\ No newline at end of file
diff --git a/src/ext/ComPlus/appveyor.yml b/src/ext/ComPlus/appveyor.yml
new file mode 100644
index 00000000..c53cc9cc
--- /dev/null
+++ b/src/ext/ComPlus/appveyor.yml
@@ -0,0 +1,42 @@
+# 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.
+#
+#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
+#  then update all of the repos.
+
+branches:
+  only:
+    - master
+    - develop
+
+image: Visual Studio 2019
+
+version: 0.0.0.{build}
+configuration: Release
+
+environment:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  NUGET_XMLDOC_MODE: skip
+
+build_script:
+  - appveyor.cmd
+
+pull_requests:
+  do_not_increment_build_number: true
+
+nuget:
+  disable_publish_on_pr: true
+
+skip_branch_with_pr: true
+skip_tags: true
+
+artifacts:
+- path: build\Release\**\*.nupkg
+  name: nuget
+- path: build\Release\**\*.snupkg
+  name: snupkg
+
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/ca/complusca.def b/src/ext/ComPlus/ca/complusca.def
index 7c475759..7c475759 100644
--- a/src/ca/complusca.def
+++ b/src/ext/ComPlus/ca/complusca.def
diff --git a/src/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj
index 3a7f6e64..3a7f6e64 100644
--- a/src/ca/complusca.vcxproj
+++ b/src/ext/ComPlus/ca/complusca.vcxproj
diff --git a/src/ca/cpappexec.cpp b/src/ext/ComPlus/ca/cpappexec.cpp
index 48948210..48948210 100644
--- a/src/ca/cpappexec.cpp
+++ b/src/ext/ComPlus/ca/cpappexec.cpp
diff --git a/src/ca/cpappexec.h b/src/ext/ComPlus/ca/cpappexec.h
index 5003b046..5003b046 100644
--- a/src/ca/cpappexec.h
+++ b/src/ext/ComPlus/ca/cpappexec.h
diff --git a/src/ca/cpapproleexec.cpp b/src/ext/ComPlus/ca/cpapproleexec.cpp
index e3b71e93..e3b71e93 100644
--- a/src/ca/cpapproleexec.cpp
+++ b/src/ext/ComPlus/ca/cpapproleexec.cpp
diff --git a/src/ca/cpapproleexec.h b/src/ext/ComPlus/ca/cpapproleexec.h
index 1251cbdb..1251cbdb 100644
--- a/src/ca/cpapproleexec.h
+++ b/src/ext/ComPlus/ca/cpapproleexec.h
diff --git a/src/ca/cpapprolesched.cpp b/src/ext/ComPlus/ca/cpapprolesched.cpp
index a268d156..a268d156 100644
--- a/src/ca/cpapprolesched.cpp
+++ b/src/ext/ComPlus/ca/cpapprolesched.cpp
diff --git a/src/ca/cpapprolesched.h b/src/ext/ComPlus/ca/cpapprolesched.h
index 02852eef..02852eef 100644
--- a/src/ca/cpapprolesched.h
+++ b/src/ext/ComPlus/ca/cpapprolesched.h
diff --git a/src/ca/cpappsched.cpp b/src/ext/ComPlus/ca/cpappsched.cpp
index 1fb2203b..1fb2203b 100644
--- a/src/ca/cpappsched.cpp
+++ b/src/ext/ComPlus/ca/cpappsched.cpp
diff --git a/src/ca/cpappsched.h b/src/ext/ComPlus/ca/cpappsched.h
index 2cd6a0ee..2cd6a0ee 100644
--- a/src/ca/cpappsched.h
+++ b/src/ext/ComPlus/ca/cpappsched.h
diff --git a/src/ca/cpasmexec.cpp b/src/ext/ComPlus/ca/cpasmexec.cpp
index 3d140027..3d140027 100644
--- a/src/ca/cpasmexec.cpp
+++ b/src/ext/ComPlus/ca/cpasmexec.cpp
diff --git a/src/ca/cpasmexec.h b/src/ext/ComPlus/ca/cpasmexec.h
index 56184c01..56184c01 100644
--- a/src/ca/cpasmexec.h
+++ b/src/ext/ComPlus/ca/cpasmexec.h
diff --git a/src/ca/cpasmsched.cpp b/src/ext/ComPlus/ca/cpasmsched.cpp
index 2d0573a5..2d0573a5 100644
--- a/src/ca/cpasmsched.cpp
+++ b/src/ext/ComPlus/ca/cpasmsched.cpp
diff --git a/src/ca/cpasmsched.h b/src/ext/ComPlus/ca/cpasmsched.h
index ddf4b6c0..ddf4b6c0 100644
--- a/src/ca/cpasmsched.h
+++ b/src/ext/ComPlus/ca/cpasmsched.h
diff --git a/src/ca/cpcost.h b/src/ext/ComPlus/ca/cpcost.h
index 7a23e03b..7a23e03b 100644
--- a/src/ca/cpcost.h
+++ b/src/ext/ComPlus/ca/cpcost.h
diff --git a/src/ca/cpexec.cpp b/src/ext/ComPlus/ca/cpexec.cpp
index 9b1691fc..9b1691fc 100644
--- a/src/ca/cpexec.cpp
+++ b/src/ext/ComPlus/ca/cpexec.cpp
diff --git a/src/ca/cppartexec.cpp b/src/ext/ComPlus/ca/cppartexec.cpp
index 673bdaf9..673bdaf9 100644
--- a/src/ca/cppartexec.cpp
+++ b/src/ext/ComPlus/ca/cppartexec.cpp
diff --git a/src/ca/cppartexec.h b/src/ext/ComPlus/ca/cppartexec.h
index 132a9f5a..132a9f5a 100644
--- a/src/ca/cppartexec.h
+++ b/src/ext/ComPlus/ca/cppartexec.h
diff --git a/src/ca/cppartroleexec.cpp b/src/ext/ComPlus/ca/cppartroleexec.cpp
index 4a503c79..4a503c79 100644
--- a/src/ca/cppartroleexec.cpp
+++ b/src/ext/ComPlus/ca/cppartroleexec.cpp
diff --git a/src/ca/cppartroleexec.h b/src/ext/ComPlus/ca/cppartroleexec.h
index 0ec47dad..0ec47dad 100644
--- a/src/ca/cppartroleexec.h
+++ b/src/ext/ComPlus/ca/cppartroleexec.h
diff --git a/src/ca/cppartrolesched.cpp b/src/ext/ComPlus/ca/cppartrolesched.cpp
index a988f8e3..a988f8e3 100644
--- a/src/ca/cppartrolesched.cpp
+++ b/src/ext/ComPlus/ca/cppartrolesched.cpp
diff --git a/src/ca/cppartrolesched.h b/src/ext/ComPlus/ca/cppartrolesched.h
index ff1275d9..ff1275d9 100644
--- a/src/ca/cppartrolesched.h
+++ b/src/ext/ComPlus/ca/cppartrolesched.h
diff --git a/src/ca/cppartsched.cpp b/src/ext/ComPlus/ca/cppartsched.cpp
index 7cd98791..7cd98791 100644
--- a/src/ca/cppartsched.cpp
+++ b/src/ext/ComPlus/ca/cppartsched.cpp
diff --git a/src/ca/cppartsched.h b/src/ext/ComPlus/ca/cppartsched.h
index 55085912..55085912 100644
--- a/src/ca/cppartsched.h
+++ b/src/ext/ComPlus/ca/cppartsched.h
diff --git a/src/ca/cpsched.cpp b/src/ext/ComPlus/ca/cpsched.cpp
index ebc547ae..ebc547ae 100644
--- a/src/ca/cpsched.cpp
+++ b/src/ext/ComPlus/ca/cpsched.cpp
diff --git a/src/ca/cpsubsexec.cpp b/src/ext/ComPlus/ca/cpsubsexec.cpp
index bbcf9853..bbcf9853 100644
--- a/src/ca/cpsubsexec.cpp
+++ b/src/ext/ComPlus/ca/cpsubsexec.cpp
diff --git a/src/ca/cpsubsexec.h b/src/ext/ComPlus/ca/cpsubsexec.h
index 2f4d3c75..2f4d3c75 100644
--- a/src/ca/cpsubsexec.h
+++ b/src/ext/ComPlus/ca/cpsubsexec.h
diff --git a/src/ca/cpsubssched.cpp b/src/ext/ComPlus/ca/cpsubssched.cpp
index df15fd03..df15fd03 100644
--- a/src/ca/cpsubssched.cpp
+++ b/src/ext/ComPlus/ca/cpsubssched.cpp
diff --git a/src/ca/cpsubssched.h b/src/ext/ComPlus/ca/cpsubssched.h
index 83ff1af8..83ff1af8 100644
--- a/src/ca/cpsubssched.h
+++ b/src/ext/ComPlus/ca/cpsubssched.h
diff --git a/src/ca/cputilexec.cpp b/src/ext/ComPlus/ca/cputilexec.cpp
index 1c2c8b93..1c2c8b93 100644
--- a/src/ca/cputilexec.cpp
+++ b/src/ext/ComPlus/ca/cputilexec.cpp
diff --git a/src/ca/cputilexec.h b/src/ext/ComPlus/ca/cputilexec.h
index b900883d..b900883d 100644
--- a/src/ca/cputilexec.h
+++ b/src/ext/ComPlus/ca/cputilexec.h
diff --git a/src/ca/cputilsched.cpp b/src/ext/ComPlus/ca/cputilsched.cpp
index 1a958c56..1a958c56 100644
--- a/src/ca/cputilsched.cpp
+++ b/src/ext/ComPlus/ca/cputilsched.cpp
diff --git a/src/ca/cputilsched.h b/src/ext/ComPlus/ca/cputilsched.h
index 1f315576..1f315576 100644
--- a/src/ca/cputilsched.h
+++ b/src/ext/ComPlus/ca/cputilsched.h
diff --git a/src/ca/custommsierrors.h b/src/ext/ComPlus/ca/custommsierrors.h
index 219df698..219df698 100644
--- a/src/ca/custommsierrors.h
+++ b/src/ext/ComPlus/ca/custommsierrors.h
diff --git a/src/ca/dllmain.cpp b/src/ext/ComPlus/ca/dllmain.cpp
index 7d299feb..7d299feb 100644
--- a/src/ca/dllmain.cpp
+++ b/src/ext/ComPlus/ca/dllmain.cpp
diff --git a/src/ca/packages.config b/src/ext/ComPlus/ca/packages.config
index e3dc0e43..e3dc0e43 100644
--- a/src/ca/packages.config
+++ b/src/ext/ComPlus/ca/packages.config
diff --git a/src/ca/precomp.h b/src/ext/ComPlus/ca/precomp.h
index 74c328d2..74c328d2 100644
--- a/src/ca/precomp.h
+++ b/src/ext/ComPlus/ca/precomp.h
diff --git a/src/ext/ComPlus/nuget.config b/src/ext/ComPlus/nuget.config
new file mode 100644
index 00000000..db7aba29
--- /dev/null
+++ b/src/ext/ComPlus/nuget.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
+    <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
+    <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
+    <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
+    <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
+    <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
+    <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
+    <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" />
+    <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" />
+    <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
index ace4d6b6..ace4d6b6 100644
--- a/src/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
diff --git a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.en-us.wxl b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.en-us.wxl
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs
index bd31e81f..bd31e81f 100644
--- a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/Package.wxs
diff --git a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/PackageComponents.wxs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/PackageComponents.wxs
index f61eedd6..f61eedd6 100644
--- a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/PackageComponents.wxs
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/example.txt b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/example.txt
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/TestData/UsingComPlusPartition/example.txt
diff --git a/src/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
index e4a529cb..e4a529cb 100644
--- a/src/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
diff --git a/src/wix.snk b/src/ext/ComPlus/wix.snk
index 3908a66a..3908a66a 100644
--- a/src/wix.snk
+++ b/src/ext/ComPlus/wix.snk
diff --git a/src/wixext/ComPlusCompiler.cs b/src/ext/ComPlus/wixext/ComPlusCompiler.cs
index 4404801e..4404801e 100644
--- a/src/wixext/ComPlusCompiler.cs
+++ b/src/ext/ComPlus/wixext/ComPlusCompiler.cs
diff --git a/src/wixext/ComPlusDecompiler.cs b/src/ext/ComPlus/wixext/ComPlusDecompiler.cs
index 6da2df94..6da2df94 100644
--- a/src/wixext/ComPlusDecompiler.cs
+++ b/src/ext/ComPlus/wixext/ComPlusDecompiler.cs
diff --git a/src/wixext/ComPlusErrors.cs b/src/ext/ComPlus/wixext/ComPlusErrors.cs
index 91b41679..91b41679 100644
--- a/src/wixext/ComPlusErrors.cs
+++ b/src/ext/ComPlus/wixext/ComPlusErrors.cs
diff --git a/src/wixext/ComPlusExtensionData.cs b/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
index 9cd5341e..9cd5341e 100644
--- a/src/wixext/ComPlusExtensionData.cs
+++ b/src/ext/ComPlus/wixext/ComPlusExtensionData.cs
diff --git a/src/wixext/ComPlusExtensionFactory.cs b/src/ext/ComPlus/wixext/ComPlusExtensionFactory.cs
index 76b51bff..76b51bff 100644
--- a/src/wixext/ComPlusExtensionFactory.cs
+++ b/src/ext/ComPlus/wixext/ComPlusExtensionFactory.cs
diff --git a/src/wixext/ComPlusTableDefinitions.cs b/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs
index 565e1d44..565e1d44 100644
--- a/src/wixext/ComPlusTableDefinitions.cs
+++ b/src/ext/ComPlus/wixext/ComPlusTableDefinitions.cs
diff --git a/src/wixext/ComPlusWarnings.cs b/src/ext/ComPlus/wixext/ComPlusWarnings.cs
index e0000918..e0000918 100644
--- a/src/wixext/ComPlusWarnings.cs
+++ b/src/ext/ComPlus/wixext/ComPlusWarnings.cs
diff --git a/src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs b/src/ext/ComPlus/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs
index cf226a3d..cf226a3d 100644
--- a/src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs
+++ b/src/ext/ComPlus/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs
diff --git a/src/wixext/Symbols/ComPlusApplicationPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationPropertySymbol.cs
index 6d1e2d28..6d1e2d28 100644
--- a/src/wixext/Symbols/ComPlusApplicationPropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationPropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs
index 3b957899..3b957899 100644
--- a/src/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRolePropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusApplicationRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRoleSymbol.cs
index 84028ee3..84028ee3 100644
--- a/src/wixext/Symbols/ComPlusApplicationRoleSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationRoleSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusApplicationSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationSymbol.cs
index ce541e43..ce541e43 100644
--- a/src/wixext/Symbols/ComPlusApplicationSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusApplicationSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs
index 549d53e4..549d53e4 100644
--- a/src/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblyDependencySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusAssemblySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblySymbol.cs
index 1329df30..1329df30 100644
--- a/src/wixext/Symbols/ComPlusAssemblySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusAssemblySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusComponentPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentPropertySymbol.cs
index b1d85b60..b1d85b60 100644
--- a/src/wixext/Symbols/ComPlusComponentPropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentPropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusComponentSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentSymbol.cs
index 020b754c..020b754c 100644
--- a/src/wixext/Symbols/ComPlusComponentSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusComponentSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs
index d6b91e99..d6b91e99 100644
--- a/src/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInApplicationRoleSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs
index da70de9f..da70de9f 100644
--- a/src/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusGroupInPartitionRoleSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusInterfacePropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfacePropertySymbol.cs
index 2ed4ce18..2ed4ce18 100644
--- a/src/wixext/Symbols/ComPlusInterfacePropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfacePropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusInterfaceSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfaceSymbol.cs
index f875b424..f875b424 100644
--- a/src/wixext/Symbols/ComPlusInterfaceSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusInterfaceSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusMethodPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodPropertySymbol.cs
index 65b17ea4..65b17ea4 100644
--- a/src/wixext/Symbols/ComPlusMethodPropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodPropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusMethodSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodSymbol.cs
index 9959a56f..9959a56f 100644
--- a/src/wixext/Symbols/ComPlusMethodSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusMethodSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusPartitionPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionPropertySymbol.cs
index e42feae2..e42feae2 100644
--- a/src/wixext/Symbols/ComPlusPartitionPropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionPropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusPartitionRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionRoleSymbol.cs
index 23293d93..23293d93 100644
--- a/src/wixext/Symbols/ComPlusPartitionRoleSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionRoleSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusPartitionSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionSymbol.cs
index c60fca40..c60fca40 100644
--- a/src/wixext/Symbols/ComPlusPartitionSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusPartitionUserSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionUserSymbol.cs
index c4d52f54..c4d52f54 100644
--- a/src/wixext/Symbols/ComPlusPartitionUserSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusPartitionUserSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusRoleForComponentSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForComponentSymbol.cs
index 2d9968ee..2d9968ee 100644
--- a/src/wixext/Symbols/ComPlusRoleForComponentSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForComponentSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs
index b77bd215..b77bd215 100644
--- a/src/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForInterfaceSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusRoleForMethodSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForMethodSymbol.cs
index 9ba9d03b..9ba9d03b 100644
--- a/src/wixext/Symbols/ComPlusRoleForMethodSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusRoleForMethodSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs
index af995c3d..af995c3d 100644
--- a/src/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionPropertySymbol.cs
diff --git a/src/wixext/Symbols/ComPlusSubscriptionSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionSymbol.cs
index 24d3f92e..24d3f92e 100644
--- a/src/wixext/Symbols/ComPlusSubscriptionSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusSubscriptionSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusSymbolDefinitions.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusSymbolDefinitions.cs
index 407b9c14..407b9c14 100644
--- a/src/wixext/Symbols/ComPlusSymbolDefinitions.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusSymbolDefinitions.cs
diff --git a/src/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs
index 1f2e01b2..1f2e01b2 100644
--- a/src/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInApplicationRoleSymbol.cs
diff --git a/src/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs
index 10df94bf..10df94bf 100644
--- a/src/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs
+++ b/src/ext/ComPlus/wixext/Symbols/ComPlusUserInPartitionRoleSymbol.cs
diff --git a/src/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
index 11271ad3..11271ad3 100644
--- a/src/wixext/WixToolset.ComPlus.wixext.csproj
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
diff --git a/src/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
index 3197250b..3197250b 100644
--- a/src/wixext/WixToolset.ComPlus.wixext.nuspec
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
diff --git a/src/wixext/WixToolset.ComPlus.wixext.targets b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
index 8115b715..8115b715 100644
--- a/src/wixext/WixToolset.ComPlus.wixext.targets
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
diff --git a/src/wixlib/ComPlusExtension.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs
index fe74eeae..fe74eeae 100644
--- a/src/wixlib/ComPlusExtension.wxs
+++ b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs
diff --git a/src/wixlib/caerr.wxi b/src/ext/ComPlus/wixlib/caerr.wxi
index ff7ec121..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/ext/ComPlus/wixlib/caerr.wxi
diff --git a/src/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj
index ef792a13..ef792a13 100644
--- a/src/wixlib/complus.wixproj
+++ b/src/ext/ComPlus/wixlib/complus.wixproj
diff --git a/src/wixlib/en-us.wxl b/src/ext/ComPlus/wixlib/en-us.wxl
index 8f6f38fc..8f6f38fc 100644
--- a/src/wixlib/en-us.wxl
+++ b/src/ext/ComPlus/wixlib/en-us.wxl
diff --git a/src/wixlib/es-es.wxl b/src/ext/ComPlus/wixlib/es-es.wxl
index 5e7eba66..5e7eba66 100644
--- a/src/wixlib/es-es.wxl
+++ b/src/ext/ComPlus/wixlib/es-es.wxl
diff --git a/src/wixlib/ja-jp.wxl b/src/ext/ComPlus/wixlib/ja-jp.wxl
index 03b2cf1c..03b2cf1c 100644
--- a/src/wixlib/ja-jp.wxl
+++ b/src/ext/ComPlus/wixlib/ja-jp.wxl
diff --git a/src/ext/global.json b/src/ext/global.json
new file mode 100644
index 00000000..23dd3fa6
--- /dev/null
+++ b/src/ext/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "WixToolset.Sdk": "4.0.0-build-0211"
+  }
+}
diff --git a/src/version.json b/src/version.json
new file mode 100644
index 00000000..5f857771
--- /dev/null
+++ b/src/version.json
@@ -0,0 +1,11 @@
+{
+  "version": "4.0",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$"
+  ],
+  "cloudBuild": {
+    "buildNumber": {
+      "enabled": true
+    }
+  }
+}