169 files changed, 242 insertions, 13 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/CustomizedNativeRecommendedRules.ruleset b/src/ext/Util/CustomizedNativeRecommendedRules.ruleset
index 142b141c..142b141c 100644
--- a/src/CustomizedNativeRecommendedRules.ruleset
+++ b/src/ext/Util/CustomizedNativeRecommendedRules.ruleset
diff --git a/src/Directory.Build.props b/src/ext/Util/Directory.Build.props
index b3c6287c..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/ext/Util/Directory.Build.props
diff --git a/src/Directory.Build.targets b/src/ext/Util/Directory.Build.targets
index 2fcc765a..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/ext/Util/Directory.Build.targets
diff --git a/src/Directory.csproj.props b/src/ext/Util/Directory.csproj.props
index 81d24ad1..81d24ad1 100644
--- a/src/Directory.csproj.props
+++ b/src/ext/Util/Directory.csproj.props
diff --git a/src/Directory.csproj.targets b/src/ext/Util/Directory.csproj.targets
index c3270426..c3270426 100644
--- a/src/Directory.csproj.targets
+++ b/src/ext/Util/Directory.csproj.targets
diff --git a/src/Directory.vcxproj.props b/src/ext/Util/Directory.vcxproj.props
index 11778f41..11778f41 100644
--- a/src/Directory.vcxproj.props
+++ b/src/ext/Util/Directory.vcxproj.props
diff --git a/src/ext/Util/README.md b/src/ext/Util/README.md
new file mode 100644
index 00000000..540c539c
--- /dev/null
+++ b/src/ext/Util/README.md
@@ -0,0 +1,3 @@
+# Util.wixext
+WixToolset.Util.wixext - Utility WiX Toolset Extension 
+
diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln
new file mode 100644
index 00000000..050fd8b3
--- /dev/null
+++ b/src/ext/Util/Util.wixext.sln
@@ -0,0 +1,87 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30204.135
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "src\wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "src\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.v3.ncrunchsolution b/src/ext/Util/Util.wixext.v3.ncrunchsolution
new file mode 100644
index 00000000..10420ac9
--- /dev/null
+++ b/src/ext/Util/Util.wixext.v3.ncrunchsolution
@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/ext/Util/appveyor.cmd b/src/ext/Util/appveyor.cmd
new file mode 100644
index 00000000..8322ffae
--- /dev/null
+++ b/src/ext/Util/appveyor.cmd
@@ -0,0 +1,19 @@
+@setlocal
+@pushd %~dp0
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
+
+:: Restore
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
+
+:: Build
+msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
+
+:: Test
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b
+
+:: Pack
+msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
+
+@popd
+@endlocal
diff --git a/src/ext/Util/appveyor.yml b/src/ext/Util/appveyor.yml
new file mode 100644
index 00000000..7c686b04
--- /dev/null
+++ b/src/ext/Util/appveyor.yml
@@ -0,0 +1,40 @@
+# 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
+
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/be/UtilBundleExtension.cpp b/src/ext/Util/be/UtilBundleExtension.cpp
index 2ac842a5..2ac842a5 100644
--- a/src/be/UtilBundleExtension.cpp
+++ b/src/ext/Util/be/UtilBundleExtension.cpp
diff --git a/src/be/UtilBundleExtension.h b/src/ext/Util/be/UtilBundleExtension.h
index c55d6b85..c55d6b85 100644
--- a/src/be/UtilBundleExtension.h
+++ b/src/ext/Util/be/UtilBundleExtension.h
diff --git a/src/be/beDecor.h b/src/ext/Util/be/beDecor.h
index 2c6a8818..2c6a8818 100644
--- a/src/be/beDecor.h
+++ b/src/ext/Util/be/beDecor.h
diff --git a/src/be/detectsha2support.cpp b/src/ext/Util/be/detectsha2support.cpp
index 90e349cd..90e349cd 100644
--- a/src/be/detectsha2support.cpp
+++ b/src/ext/Util/be/detectsha2support.cpp
diff --git a/src/be/detectsha2support.h b/src/ext/Util/be/detectsha2support.h
index c38a3d59..c38a3d59 100644
--- a/src/be/detectsha2support.h
+++ b/src/ext/Util/be/detectsha2support.h
diff --git a/src/be/precomp.cpp b/src/ext/Util/be/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/be/precomp.cpp
+++ b/src/ext/Util/be/precomp.cpp
diff --git a/src/be/precomp.h b/src/ext/Util/be/precomp.h
index 76d24c7b..76d24c7b 100644
--- a/src/be/precomp.h
+++ b/src/ext/Util/be/precomp.h
diff --git a/src/be/utilbe.cpp b/src/ext/Util/be/utilbe.cpp
index d9816dc7..d9816dc7 100644
--- a/src/be/utilbe.cpp
+++ b/src/ext/Util/be/utilbe.cpp
diff --git a/src/be/utilbe.def b/src/ext/Util/be/utilbe.def
index 711b1a5c..711b1a5c 100644
--- a/src/be/utilbe.def
+++ b/src/ext/Util/be/utilbe.def
diff --git a/src/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj
index 683b376a..683b376a 100644
--- a/src/be/utilbe.vcxproj
+++ b/src/ext/Util/be/utilbe.vcxproj
diff --git a/src/be/utilsearch.cpp b/src/ext/Util/be/utilsearch.cpp
index 7cd2ea09..7cd2ea09 100644
--- a/src/be/utilsearch.cpp
+++ b/src/ext/Util/be/utilsearch.cpp
diff --git a/src/be/utilsearch.h b/src/ext/Util/be/utilsearch.h
index deeab1f7..deeab1f7 100644
--- a/src/be/utilsearch.h
+++ b/src/ext/Util/be/utilsearch.h
diff --git a/src/ca/BroadcastSettingChange.cpp b/src/ext/Util/ca/BroadcastSettingChange.cpp
index 2e153ad3..2e153ad3 100644
--- a/src/ca/BroadcastSettingChange.cpp
+++ b/src/ext/Util/ca/BroadcastSettingChange.cpp
diff --git a/src/ca/CheckReboot.cpp b/src/ext/Util/ca/CheckReboot.cpp
index ce056411..ce056411 100644
--- a/src/ca/CheckReboot.cpp
+++ b/src/ext/Util/ca/CheckReboot.cpp
diff --git a/src/ca/CloseApps.cpp b/src/ext/Util/ca/CloseApps.cpp
index d4256c43..d4256c43 100644
--- a/src/ca/CloseApps.cpp
+++ b/src/ext/Util/ca/CloseApps.cpp
diff --git a/src/ca/CustomMsiErrors.h b/src/ext/Util/ca/CustomMsiErrors.h
index 3218b61b..3218b61b 100644
--- a/src/ca/CustomMsiErrors.h
+++ b/src/ext/Util/ca/CustomMsiErrors.h
diff --git a/src/ca/FormatFiles.cpp b/src/ext/Util/ca/FormatFiles.cpp
index d1533999..d1533999 100644
--- a/src/ca/FormatFiles.cpp
+++ b/src/ext/Util/ca/FormatFiles.cpp
diff --git a/src/ca/OsInfo.cpp b/src/ext/Util/ca/OsInfo.cpp
index 4783673e..4783673e 100644
--- a/src/ca/OsInfo.cpp
+++ b/src/ext/Util/ca/OsInfo.cpp
diff --git a/src/ca/RemoveFoldersEx.cpp b/src/ext/Util/ca/RemoveFoldersEx.cpp
index cbc7f4bb..cbc7f4bb 100644
--- a/src/ca/RemoveFoldersEx.cpp
+++ b/src/ext/Util/ca/RemoveFoldersEx.cpp
diff --git a/src/ca/RemoveRegistryKeysEx.cpp b/src/ext/Util/ca/RemoveRegistryKeysEx.cpp
index 478c0779..478c0779 100644
--- a/src/ca/RemoveRegistryKeysEx.cpp
+++ b/src/ext/Util/ca/RemoveRegistryKeysEx.cpp
diff --git a/src/ca/RestartManager.cpp b/src/ext/Util/ca/RestartManager.cpp
index c31819c1..c31819c1 100644
--- a/src/ca/RestartManager.cpp
+++ b/src/ext/Util/ca/RestartManager.cpp
diff --git a/src/ca/TouchFile.cpp b/src/ext/Util/ca/TouchFile.cpp
index e704f922..e704f922 100644
--- a/src/ca/TouchFile.cpp
+++ b/src/ext/Util/ca/TouchFile.cpp
diff --git a/src/ca/XmlConfig.cpp b/src/ext/Util/ca/XmlConfig.cpp
index a1ec9d6f..a1ec9d6f 100644
--- a/src/ca/XmlConfig.cpp
+++ b/src/ext/Util/ca/XmlConfig.cpp
diff --git a/src/ca/XmlFile.cpp b/src/ext/Util/ca/XmlFile.cpp
index 04a4ae98..04a4ae98 100644
--- a/src/ca/XmlFile.cpp
+++ b/src/ext/Util/ca/XmlFile.cpp
diff --git a/src/ca/caDecor.h b/src/ext/Util/ca/caDecor.h
index 56cfb201..da274650 100644
--- a/src/ca/caDecor.h
+++ b/src/ext/Util/ca/caDecor.h
@@ -1,13 +1,13 @@
-#pragma once

-// 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.

-

-

-#if defined(_M_ARM64)

-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"

-#elif defined(_M_AMD64)

-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"

-#elif defined(_M_ARM)

-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"

-#else

-#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"

-#endif

+#pragma once
+// 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.
+
+
+#if defined(_M_ARM64)
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_A64"
+#elif defined(_M_AMD64)
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X64"
+#elif defined(_M_ARM)
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_ARM"
+#else
+#define CUSTOM_ACTION_DECORATION(f) L"Wix4" f L"_X86"
+#endif
diff --git a/src/ca/cost.h b/src/ext/Util/ca/cost.h
index 6507e85d..6507e85d 100644
--- a/src/ca/cost.h
+++ b/src/ext/Util/ca/cost.h
diff --git a/src/ca/dllmain.cpp b/src/ext/Util/ca/dllmain.cpp
index 35ae6d1c..35ae6d1c 100644
--- a/src/ca/dllmain.cpp
+++ b/src/ext/Util/ca/dllmain.cpp
diff --git a/src/ca/exitearlywithsuccess.cpp b/src/ext/Util/ca/exitearlywithsuccess.cpp
index 00828329..00828329 100644
--- a/src/ca/exitearlywithsuccess.cpp
+++ b/src/ext/Util/ca/exitearlywithsuccess.cpp
diff --git a/src/ca/netshortcuts.cpp b/src/ext/Util/ca/netshortcuts.cpp
index 06826264..06826264 100644
--- a/src/ca/netshortcuts.cpp
+++ b/src/ext/Util/ca/netshortcuts.cpp
diff --git a/src/ca/precomp.h b/src/ext/Util/ca/precomp.h
index c5d6afe5..c5d6afe5 100644
--- a/src/ca/precomp.h
+++ b/src/ext/Util/ca/precomp.h
diff --git a/src/ca/qtexecca.cpp b/src/ext/Util/ca/qtexecca.cpp
index ddcc812f..ddcc812f 100644
--- a/src/ca/qtexecca.cpp
+++ b/src/ext/Util/ca/qtexecca.cpp
diff --git a/src/ca/sca.h b/src/ext/Util/ca/sca.h
index 599122ff..599122ff 100644
--- a/src/ca/sca.h
+++ b/src/ext/Util/ca/sca.h
diff --git a/src/ca/scacost.h b/src/ext/Util/ca/scacost.h
index 5b215035..5b215035 100644
--- a/src/ca/scacost.h
+++ b/src/ext/Util/ca/scacost.h
diff --git a/src/ca/scaexec.cpp b/src/ext/Util/ca/scaexec.cpp
index 5845c1b4..5845c1b4 100644
--- a/src/ca/scaexec.cpp
+++ b/src/ext/Util/ca/scaexec.cpp
diff --git a/src/ca/scamanifest.cpp b/src/ext/Util/ca/scamanifest.cpp
index adb8d3d3..adb8d3d3 100644
--- a/src/ca/scamanifest.cpp
+++ b/src/ext/Util/ca/scamanifest.cpp
diff --git a/src/ca/scaperf.cpp b/src/ext/Util/ca/scaperf.cpp
index fd301278..fd301278 100644
--- a/src/ca/scaperf.cpp
+++ b/src/ext/Util/ca/scaperf.cpp
diff --git a/src/ca/scaperfexec.cpp b/src/ext/Util/ca/scaperfexec.cpp
index c5425754..c5425754 100644
--- a/src/ca/scaperfexec.cpp
+++ b/src/ext/Util/ca/scaperfexec.cpp
diff --git a/src/ca/scasched.cpp b/src/ext/Util/ca/scasched.cpp
index d81b1f14..d81b1f14 100644
--- a/src/ca/scasched.cpp
+++ b/src/ext/Util/ca/scasched.cpp
diff --git a/src/ca/scasmb.h b/src/ext/Util/ca/scasmb.h
index f2a4b53c..f2a4b53c 100644
--- a/src/ca/scasmb.h
+++ b/src/ext/Util/ca/scasmb.h
diff --git a/src/ca/scasmbexec.cpp b/src/ext/Util/ca/scasmbexec.cpp
index ced3aa78..ced3aa78 100644
--- a/src/ca/scasmbexec.cpp
+++ b/src/ext/Util/ca/scasmbexec.cpp
diff --git a/src/ca/scasmbexec.h b/src/ext/Util/ca/scasmbexec.h
index e3c8f8bb..e3c8f8bb 100644
--- a/src/ca/scasmbexec.h
+++ b/src/ext/Util/ca/scasmbexec.h
diff --git a/src/ca/scasmbsched.cpp b/src/ext/Util/ca/scasmbsched.cpp
index e29f7f51..e29f7f51 100644
--- a/src/ca/scasmbsched.cpp
+++ b/src/ext/Util/ca/scasmbsched.cpp
diff --git a/src/ca/scauser.cpp b/src/ext/Util/ca/scauser.cpp
index b25e9daf..b25e9daf 100644
--- a/src/ca/scauser.cpp
+++ b/src/ext/Util/ca/scauser.cpp
diff --git a/src/ca/scauser.h b/src/ext/Util/ca/scauser.h
index a5fd5ea8..a5fd5ea8 100644
--- a/src/ca/scauser.h
+++ b/src/ext/Util/ca/scauser.h
diff --git a/src/ca/secureobj.cpp b/src/ext/Util/ca/secureobj.cpp
index 72842eb5..72842eb5 100644
--- a/src/ca/secureobj.cpp
+++ b/src/ext/Util/ca/secureobj.cpp
diff --git a/src/ca/serviceconfig.cpp b/src/ext/Util/ca/serviceconfig.cpp
index 04b25ffa..04b25ffa 100644
--- a/src/ca/serviceconfig.cpp
+++ b/src/ext/Util/ca/serviceconfig.cpp
diff --git a/src/ca/shellexecca.cpp b/src/ext/Util/ca/shellexecca.cpp
index ea21d3bd..ea21d3bd 100644
--- a/src/ca/shellexecca.cpp
+++ b/src/ext/Util/ca/shellexecca.cpp
diff --git a/src/ca/test.cpp b/src/ext/Util/ca/test.cpp
index c4d215f0..c4d215f0 100644
--- a/src/ca/test.cpp
+++ b/src/ext/Util/ca/test.cpp
diff --git a/src/ca/utilca.cpp b/src/ext/Util/ca/utilca.cpp
index 37664a1c..37664a1c 100644
--- a/src/ca/utilca.cpp
+++ b/src/ext/Util/ca/utilca.cpp
diff --git a/src/ca/utilca.def b/src/ext/Util/ca/utilca.def
index 412d86a3..412d86a3 100644
--- a/src/ca/utilca.def
+++ b/src/ext/Util/ca/utilca.def
diff --git a/src/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj
index 7b64db95..7b64db95 100644
--- a/src/ca/utilca.vcxproj
+++ b/src/ext/Util/ca/utilca.vcxproj
diff --git a/src/ext/Util/nuget.config b/src/ext/Util/nuget.config
new file mode 100644
index 00000000..8d711148
--- /dev/null
+++ b/src/ext/Util/nuget.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" />
+    <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.Util/TestData/.Data/burn.exe b/src/ext/Util/test/WixToolsetTest.Util/TestData/.Data/burn.exe
index 2a4f423f..2a4f423f 100644
--- a/src/test/WixToolsetTest.Util/TestData/.Data/burn.exe
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/.Data/burn.exe
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
index f50a5386..f50a5386 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
index 7fef0725..7fef0725 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
index 0e461ba8..0e461ba8 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/Shared.dll
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
index 8b986220..8b986220 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/MsiPackage/test.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
index 970efdf0..970efdf0 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/fakeba.dll
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
index 0722d60e..0722d60e 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/data/test.msi
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
index 8e054256..8e054256 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
index e27b3c43..e27b3c43 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/CloseApplication/example.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
index daae573a..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
index 2ec8ce82..2ec8ce82 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/example.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/EventManifest/example.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico
index 53134de7..53134de7 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.ico
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
index daae573a..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
index 2a1b4347..2a1b4347 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcut/example.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
index 1355d42e..1355d42e 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
index 2a1b4347..2a1b4347 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/ModuleComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico
index 53134de7..53134de7 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Package.ico
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
index daae573a..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
index 0634d7d4..0634d7d4 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/PermissionEx/example.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
index abf0dbb4..abf0dbb4 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
index e27b3c43..e27b3c43 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/example.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/example.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
index 2c2be584..2c2be584 100644
--- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs
index 236d9df0..236d9df0 100644
--- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveFolderEx/ModuleComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
index 32b246f4..32b246f4 100644
--- a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/Module.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
index 0a0c8cb6..0a0c8cb6 100644
--- a/src/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/RemoveRegistryKeyEx/ModuleComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
index daae573a..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
index 7cedbb30..7cedbb30 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt
index 1b4ffe8a..1b4ffe8a 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/UsingFileShare/example.txt
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
index 5301bb1a..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
index a2002634..a2002634 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
index 29e8555b..29e8555b 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml
index bad25217..bad25217 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/XmlConfigModule/my.xml
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 883f9794..883f9794 100644
--- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index e77ecbed..e77ecbed 100644
--- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject
index 7b5b2139..7b5b2139 100644
--- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject
+++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.v3.ncrunchproject
diff --git a/src/wix.snk b/src/ext/Util/wix.snk
index 3908a66a..3908a66a 100644
--- a/src/wix.snk
+++ b/src/ext/Util/wix.snk
diff --git a/src/wixext/PerformanceCounterType.cs b/src/ext/Util/wixext/PerformanceCounterType.cs
index 1e06efd3..1e06efd3 100644
--- a/src/wixext/PerformanceCounterType.cs
+++ b/src/ext/Util/wixext/PerformanceCounterType.cs
diff --git a/src/wixext/Symbols/EventManifestSymbol.cs b/src/ext/Util/wixext/Symbols/EventManifestSymbol.cs
index ccd3c899..ccd3c899 100644
--- a/src/wixext/Symbols/EventManifestSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/EventManifestSymbol.cs
diff --git a/src/wixext/Symbols/FileSharePermissionsSymbol.cs b/src/ext/Util/wixext/Symbols/FileSharePermissionsSymbol.cs
index 3db92f22..3db92f22 100644
--- a/src/wixext/Symbols/FileSharePermissionsSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/FileSharePermissionsSymbol.cs
diff --git a/src/wixext/Symbols/FileShareSymbol.cs b/src/ext/Util/wixext/Symbols/FileShareSymbol.cs
index c956ff42..c956ff42 100644
--- a/src/wixext/Symbols/FileShareSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/FileShareSymbol.cs
diff --git a/src/wixext/Symbols/GroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupSymbol.cs
index b378db44..b378db44 100644
--- a/src/wixext/Symbols/GroupSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/GroupSymbol.cs
diff --git a/src/wixext/Symbols/PerfmonManifestSymbol.cs b/src/ext/Util/wixext/Symbols/PerfmonManifestSymbol.cs
index 03fef14e..03fef14e 100644
--- a/src/wixext/Symbols/PerfmonManifestSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/PerfmonManifestSymbol.cs
diff --git a/src/wixext/Symbols/PerfmonSymbol.cs b/src/ext/Util/wixext/Symbols/PerfmonSymbol.cs
index 6784ebd1..6784ebd1 100644
--- a/src/wixext/Symbols/PerfmonSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/PerfmonSymbol.cs
diff --git a/src/wixext/Symbols/PerformanceCategorySymbol.cs b/src/ext/Util/wixext/Symbols/PerformanceCategorySymbol.cs
index 5ecf388c..5ecf388c 100644
--- a/src/wixext/Symbols/PerformanceCategorySymbol.cs
+++ b/src/ext/Util/wixext/Symbols/PerformanceCategorySymbol.cs
diff --git a/src/wixext/Symbols/SecureObjectsSymbol.cs b/src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs
index 25fc6dca..25fc6dca 100644
--- a/src/wixext/Symbols/SecureObjectsSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/SecureObjectsSymbol.cs
diff --git a/src/wixext/Symbols/ServiceConfigSymbol.cs b/src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs
index 3a877f9b..3a877f9b 100644
--- a/src/wixext/Symbols/ServiceConfigSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/ServiceConfigSymbol.cs
diff --git a/src/wixext/Symbols/UserGroupSymbol.cs b/src/ext/Util/wixext/Symbols/UserGroupSymbol.cs
index c8f3998e..c8f3998e 100644
--- a/src/wixext/Symbols/UserGroupSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/UserGroupSymbol.cs
diff --git a/src/wixext/Symbols/UserSymbol.cs b/src/ext/Util/wixext/Symbols/UserSymbol.cs
index 5f00064b..5f00064b 100644
--- a/src/wixext/Symbols/UserSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/UserSymbol.cs
diff --git a/src/wixext/Symbols/UtilSymbolDefinitions.cs b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
index 72091c3b..72091c3b 100644
--- a/src/wixext/Symbols/UtilSymbolDefinitions.cs
+++ b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
diff --git a/src/wixext/Symbols/WixCloseApplicationSymbol.cs b/src/ext/Util/wixext/Symbols/WixCloseApplicationSymbol.cs
index 0738e3e4..0738e3e4 100644
--- a/src/wixext/Symbols/WixCloseApplicationSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixCloseApplicationSymbol.cs
diff --git a/src/wixext/Symbols/WixFormatFilesSymbol.cs b/src/ext/Util/wixext/Symbols/WixFormatFilesSymbol.cs
index 38a9b8ff..38a9b8ff 100644
--- a/src/wixext/Symbols/WixFormatFilesSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixFormatFilesSymbol.cs
diff --git a/src/wixext/Symbols/WixInternetShortcutSymbol.cs b/src/ext/Util/wixext/Symbols/WixInternetShortcutSymbol.cs
index e8265e02..e8265e02 100644
--- a/src/wixext/Symbols/WixInternetShortcutSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixInternetShortcutSymbol.cs
diff --git a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs b/src/ext/Util/wixext/Symbols/WixRemoveFolderExSymbol.cs
index 86352b6c..86352b6c 100644
--- a/src/wixext/Symbols/WixRemoveFolderExSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixRemoveFolderExSymbol.cs
diff --git a/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs b/src/ext/Util/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs
index 8e4bd212..8e4bd212 100644
--- a/src/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixRemoveRegistryKeyExSymbol.cs
diff --git a/src/wixext/Symbols/WixRestartResourceSymbol.cs b/src/ext/Util/wixext/Symbols/WixRestartResourceSymbol.cs
index 01b92b63..01b92b63 100644
--- a/src/wixext/Symbols/WixRestartResourceSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixRestartResourceSymbol.cs
diff --git a/src/wixext/Symbols/WixTouchFileSymbol.cs b/src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs
index 447c21ba..447c21ba 100644
--- a/src/wixext/Symbols/WixTouchFileSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixTouchFileSymbol.cs
diff --git a/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs b/src/ext/Util/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs
index 9a43692c..9a43692c 100644
--- a/src/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/WixWindowsFeatureSearchSymbol.cs
diff --git a/src/wixext/Symbols/XmlConfigSymbol.cs b/src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs
index 6503a586..6503a586 100644
--- a/src/wixext/Symbols/XmlConfigSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/XmlConfigSymbol.cs
diff --git a/src/wixext/Symbols/XmlFileSymbol.cs b/src/ext/Util/wixext/Symbols/XmlFileSymbol.cs
index 7d5d991b..7d5d991b 100644
--- a/src/wixext/Symbols/XmlFileSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/XmlFileSymbol.cs
diff --git a/src/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index 45079150..45079150 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
diff --git a/src/wixext/UtilConstants.cs b/src/ext/Util/wixext/UtilConstants.cs
index 28ff368f..28ff368f 100644
--- a/src/wixext/UtilConstants.cs
+++ b/src/ext/Util/wixext/UtilConstants.cs
diff --git a/src/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index 9ef3390f..9ef3390f 100644
--- a/src/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
diff --git a/src/wixext/UtilErrors.cs b/src/ext/Util/wixext/UtilErrors.cs
index b9ce1688..b9ce1688 100644
--- a/src/wixext/UtilErrors.cs
+++ b/src/ext/Util/wixext/UtilErrors.cs
diff --git a/src/wixext/UtilExtensionData.cs b/src/ext/Util/wixext/UtilExtensionData.cs
index d3ca3358..d3ca3358 100644
--- a/src/wixext/UtilExtensionData.cs
+++ b/src/ext/Util/wixext/UtilExtensionData.cs
diff --git a/src/wixext/UtilExtensionFactory.cs b/src/ext/Util/wixext/UtilExtensionFactory.cs
index 08352813..08352813 100644
--- a/src/wixext/UtilExtensionFactory.cs
+++ b/src/ext/Util/wixext/UtilExtensionFactory.cs
diff --git a/src/wixext/UtilTableDefinitions.cs b/src/ext/Util/wixext/UtilTableDefinitions.cs
index 12f423cc..12f423cc 100644
--- a/src/wixext/UtilTableDefinitions.cs
+++ b/src/ext/Util/wixext/UtilTableDefinitions.cs
diff --git a/src/wixext/UtilWarnings.cs b/src/ext/Util/wixext/UtilWarnings.cs
index b65abe45..b65abe45 100644
--- a/src/wixext/UtilWarnings.cs
+++ b/src/ext/Util/wixext/UtilWarnings.cs
diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/ext/Util/wixext/UtilWindowsInstallerBackendExtension.cs
index bca7c700..bca7c700 100644
--- a/src/wixext/UtilWindowsInstallerBackendExtension.cs
+++ b/src/ext/Util/wixext/UtilWindowsInstallerBackendExtension.cs
diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index 10fc569e..10fc569e 100644
--- a/src/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
index ba3eaade..ba3eaade 100644
--- a/src/wixext/WixToolset.Util.wixext.nuspec
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/ext/Util/wixext/WixToolset.Util.wixext.targets
index 64dff429..64dff429 100644
--- a/src/wixext/WixToolset.Util.wixext.targets
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.targets
diff --git a/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject b/src/ext/Util/wixext/WixToolset.Util.wixext.v3.ncrunchproject
index d75e7ab3..d75e7ab3 100644
--- a/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.v3.ncrunchproject
diff --git a/src/wixlib/UtilBundleExtension_Platform.wxi b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
index 379c8f57..379c8f57 100644
--- a/src/wixlib/UtilBundleExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
diff --git a/src/wixlib/UtilBundleExtension_arm64.wxs b/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs
index b17be031..b17be031 100644
--- a/src/wixlib/UtilBundleExtension_arm64.wxs
+++ b/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs
diff --git a/src/wixlib/UtilBundleExtension_x64.wxs b/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs
index 96c85a5b..96c85a5b 100644
--- a/src/wixlib/UtilBundleExtension_x64.wxs
+++ b/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs
diff --git a/src/wixlib/UtilBundleExtension_x86.wxs b/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs
index 3b458687..3b458687 100644
--- a/src/wixlib/UtilBundleExtension_x86.wxs
+++ b/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs
diff --git a/src/wixlib/UtilExtension.wxs b/src/ext/Util/wixlib/UtilExtension.wxs
index 0f445ab4..0f445ab4 100644
--- a/src/wixlib/UtilExtension.wxs
+++ b/src/ext/Util/wixlib/UtilExtension.wxs
diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
index 913c01b9..913c01b9 100644
--- a/src/wixlib/UtilExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
diff --git a/src/wixlib/UtilExtension_arm64.wxs b/src/ext/Util/wixlib/UtilExtension_arm64.wxs
index b9dc73b8..b9dc73b8 100644
--- a/src/wixlib/UtilExtension_arm64.wxs
+++ b/src/ext/Util/wixlib/UtilExtension_arm64.wxs
diff --git a/src/wixlib/UtilExtension_x64.wxs b/src/ext/Util/wixlib/UtilExtension_x64.wxs
index 40cdf306..40cdf306 100644
--- a/src/wixlib/UtilExtension_x64.wxs
+++ b/src/ext/Util/wixlib/UtilExtension_x64.wxs
diff --git a/src/wixlib/UtilExtension_x86.wxs b/src/ext/Util/wixlib/UtilExtension_x86.wxs
index bd0fa562..bd0fa562 100644
--- a/src/wixlib/UtilExtension_x86.wxs
+++ b/src/ext/Util/wixlib/UtilExtension_x86.wxs
diff --git a/src/wixlib/caDecor.wxi b/src/ext/Util/wixlib/caDecor.wxi
index b1711518..b1711518 100644
--- a/src/wixlib/caDecor.wxi
+++ b/src/ext/Util/wixlib/caDecor.wxi
diff --git a/src/wixlib/caerr.wxi b/src/ext/Util/wixlib/caerr.wxi
index ff7ec121..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/ext/Util/wixlib/caerr.wxi
diff --git a/src/wixlib/de-de.wxl b/src/ext/Util/wixlib/de-de.wxl
index 65785a3b..65785a3b 100644
--- a/src/wixlib/de-de.wxl
+++ b/src/ext/Util/wixlib/de-de.wxl
diff --git a/src/wixlib/en-us.wxl b/src/ext/Util/wixlib/en-us.wxl
index e8b146a4..e8b146a4 100644
--- a/src/wixlib/en-us.wxl
+++ b/src/ext/Util/wixlib/en-us.wxl
diff --git a/src/wixlib/es-es.wxl b/src/ext/Util/wixlib/es-es.wxl
index ca5ab8bb..ca5ab8bb 100644
--- a/src/wixlib/es-es.wxl
+++ b/src/ext/Util/wixlib/es-es.wxl
diff --git a/src/wixlib/fr-fr.wxl b/src/ext/Util/wixlib/fr-fr.wxl
index ad34b56a..ad34b56a 100644
--- a/src/wixlib/fr-fr.wxl
+++ b/src/ext/Util/wixlib/fr-fr.wxl
diff --git a/src/wixlib/it-it.wxl b/src/ext/Util/wixlib/it-it.wxl
index 8cea0a14..8cea0a14 100644
--- a/src/wixlib/it-it.wxl
+++ b/src/ext/Util/wixlib/it-it.wxl
diff --git a/src/wixlib/ja-jp.wxl b/src/ext/Util/wixlib/ja-jp.wxl
index 5f5cf40d..5f5cf40d 100644
--- a/src/wixlib/ja-jp.wxl
+++ b/src/ext/Util/wixlib/ja-jp.wxl
diff --git a/src/wixlib/pt-br.wxl b/src/ext/Util/wixlib/pt-br.wxl
index 3ca27dda..3ca27dda 100644
--- a/src/wixlib/pt-br.wxl
+++ b/src/ext/Util/wixlib/pt-br.wxl
diff --git a/src/wixlib/util.v3.ncrunchproject b/src/ext/Util/wixlib/util.v3.ncrunchproject
index 319cd523..319cd523 100644
--- a/src/wixlib/util.v3.ncrunchproject
+++ b/src/ext/Util/wixlib/util.v3.ncrunchproject
diff --git a/src/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj
index 99dede7d..99dede7d 100644
--- a/src/wixlib/util.wixproj
+++ b/src/ext/Util/wixlib/util.wixproj
diff --git a/src/ext/global.json b/src/ext/global.json
new file mode 100644
index 00000000..697f5687
--- /dev/null
+++ b/src/ext/global.json
@@ -0,0 +1,8 @@
+{
+  "msbuild-sdks": {
+    "WixToolset.Sdk": "4.0.0-build-0213"
+  },
+  "sdk": {
+    "allowPrerelease": false
+  }
+}
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
+    }
+  }
+}