164 files changed, 186 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/CustomizedNativeRecommendedRules.ruleset b/src/libs/dutil/CustomizedNativeRecommendedRules.ruleset
index 142b141c..142b141c 100644
--- a/src/CustomizedNativeRecommendedRules.ruleset
+++ b/src/libs/dutil/CustomizedNativeRecommendedRules.ruleset
diff --git a/src/Directory.Build.props b/src/libs/dutil/Directory.Build.props
index fb34d54e..fb34d54e 100644
--- a/src/Directory.Build.props
+++ b/src/libs/dutil/Directory.Build.props
diff --git a/src/Directory.Build.targets b/src/libs/dutil/Directory.Build.targets
index 44701fb6..44701fb6 100644
--- a/src/Directory.Build.targets
+++ b/src/libs/dutil/Directory.Build.targets
diff --git a/src/Directory.csproj.props b/src/libs/dutil/Directory.csproj.props
index 81d24ad1..81d24ad1 100644
--- a/src/Directory.csproj.props
+++ b/src/libs/dutil/Directory.csproj.props
diff --git a/src/Directory.vcxproj.props b/src/libs/dutil/Directory.vcxproj.props
index 9ea7071b..9ea7071b 100644
--- a/src/Directory.vcxproj.props
+++ b/src/libs/dutil/Directory.vcxproj.props
diff --git a/src/NativeMultiTargeting.Build.props b/src/libs/dutil/NativeMultiTargeting.Build.props
index 1ff46559..1ff46559 100644
--- a/src/NativeMultiTargeting.Build.props
+++ b/src/libs/dutil/NativeMultiTargeting.Build.props
diff --git a/src/libs/dutil/README.md b/src/libs/dutil/README.md
new file mode 100644
index 00000000..2d6605fe
--- /dev/null
+++ b/src/libs/dutil/README.md
@@ -0,0 +1,2 @@
+# dutil
+dutil.lib - foundation library for all native code in WiX Toolset
diff --git a/src/dutil/acl2util.cpp b/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
index 598f12e7..598f12e7 100644
--- a/src/dutil/acl2util.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
diff --git a/src/dutil/aclutil.cpp b/src/libs/dutil/WixToolset.DUtil/aclutil.cpp
index c9733033..c9733033 100644
--- a/src/dutil/aclutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/aclutil.cpp
diff --git a/src/dutil/apputil.cpp b/src/libs/dutil/WixToolset.DUtil/apputil.cpp
index 589a09dd..589a09dd 100644
--- a/src/dutil/apputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/apputil.cpp
diff --git a/src/dutil/apuputil.cpp b/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
index eb96d515..eb96d515 100644
--- a/src/dutil/apuputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
diff --git a/src/dutil/atomutil.cpp b/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
index c7c7975a..c7c7975a 100644
--- a/src/dutil/atomutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
diff --git a/src/dutil/buffutil.cpp b/src/libs/dutil/WixToolset.DUtil/buffutil.cpp
index b6d58cc0..b6d58cc0 100644
--- a/src/dutil/buffutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/buffutil.cpp
diff --git a/src/dutil/build/WixToolset.DUtil.props b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
index 35749be8..35749be8 100644
--- a/src/dutil/build/WixToolset.DUtil.props
+++ b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
diff --git a/src/dutil/butil.cpp b/src/libs/dutil/WixToolset.DUtil/butil.cpp
index e04b52e9..e04b52e9 100644
--- a/src/dutil/butil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/butil.cpp
diff --git a/src/dutil/cabcutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
index 93a9b7e1..93a9b7e1 100644
--- a/src/dutil/cabcutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
diff --git a/src/dutil/cabutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
index 5d77e483..5d77e483 100644
--- a/src/dutil/cabutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
diff --git a/src/dutil/certutil.cpp b/src/libs/dutil/WixToolset.DUtil/certutil.cpp
index 69897b9e..69897b9e 100644
--- a/src/dutil/certutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/certutil.cpp
diff --git a/src/dutil/conutil.cpp b/src/libs/dutil/WixToolset.DUtil/conutil.cpp
index 33e1b59a..33e1b59a 100644
--- a/src/dutil/conutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/conutil.cpp
diff --git a/src/dutil/cryputil.cpp b/src/libs/dutil/WixToolset.DUtil/cryputil.cpp
index 24bb83f1..24bb83f1 100644
--- a/src/dutil/cryputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/cryputil.cpp
diff --git a/src/dutil/deputil.cpp b/src/libs/dutil/WixToolset.DUtil/deputil.cpp
index 2e6d6a6c..2e6d6a6c 100644
--- a/src/dutil/deputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/deputil.cpp
diff --git a/src/dutil/dictutil.cpp b/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
index 0d0743eb..0d0743eb 100644
--- a/src/dutil/dictutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
diff --git a/src/dutil/dirutil.cpp b/src/libs/dutil/WixToolset.DUtil/dirutil.cpp
index ae2c5e1c..ae2c5e1c 100644
--- a/src/dutil/dirutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dirutil.cpp
diff --git a/src/dutil/dlutil.cpp b/src/libs/dutil/WixToolset.DUtil/dlutil.cpp
index 70155e6f..70155e6f 100644
--- a/src/dutil/dlutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dlutil.cpp
diff --git a/src/dutil/dpiutil.cpp b/src/libs/dutil/WixToolset.DUtil/dpiutil.cpp
index 4096c8d3..4096c8d3 100644
--- a/src/dutil/dpiutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dpiutil.cpp
diff --git a/src/dutil/dutil.cpp b/src/libs/dutil/WixToolset.DUtil/dutil.cpp
index 56b85207..56b85207 100644
--- a/src/dutil/dutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.cpp
diff --git a/src/dutil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 3499a2d5..3499a2d5 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
diff --git a/src/dutil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
index 4e341438..4e341438 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
diff --git a/src/dutil/dutil.vcxproj.filters b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
index b93d166b..b93d166b 100644
--- a/src/dutil/dutil.vcxproj.filters
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
diff --git a/src/dutil/eseutil.cpp b/src/libs/dutil/WixToolset.DUtil/eseutil.cpp
index b9455d4b..b9455d4b 100644
--- a/src/dutil/eseutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/eseutil.cpp
diff --git a/src/dutil/fileutil.cpp b/src/libs/dutil/WixToolset.DUtil/fileutil.cpp
index 1822727a..1822727a 100644
--- a/src/dutil/fileutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/fileutil.cpp
diff --git a/src/dutil/gdiputil.cpp b/src/libs/dutil/WixToolset.DUtil/gdiputil.cpp
index b5a0087c..b5a0087c 100644
--- a/src/dutil/gdiputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/gdiputil.cpp
diff --git a/src/dutil/guidutil.cpp b/src/libs/dutil/WixToolset.DUtil/guidutil.cpp
index 204c9af2..204c9af2 100644
--- a/src/dutil/guidutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/guidutil.cpp
diff --git a/src/dutil/iis7util.cpp b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
index d0a0b000..d0a0b000 100644
--- a/src/dutil/iis7util.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
diff --git a/src/dutil/inc/aclutil.h b/src/libs/dutil/WixToolset.DUtil/inc/aclutil.h
index ac03f9a8..ac03f9a8 100644
--- a/src/dutil/inc/aclutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/aclutil.h
diff --git a/src/dutil/inc/apputil.h b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
index 1a1e14f7..1a1e14f7 100644
--- a/src/dutil/inc/apputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
diff --git a/src/dutil/inc/apuputil.h b/src/libs/dutil/WixToolset.DUtil/inc/apuputil.h
index f26a12b7..f26a12b7 100644
--- a/src/dutil/inc/apuputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/apuputil.h
diff --git a/src/dutil/inc/atomutil.h b/src/libs/dutil/WixToolset.DUtil/inc/atomutil.h
index 9acfc1d5..9acfc1d5 100644
--- a/src/dutil/inc/atomutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/atomutil.h
diff --git a/src/dutil/inc/buffutil.h b/src/libs/dutil/WixToolset.DUtil/inc/buffutil.h
index 322209e6..322209e6 100644
--- a/src/dutil/inc/buffutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/buffutil.h
diff --git a/src/dutil/inc/butil.h b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
index d1ec73bc..d1ec73bc 100644
--- a/src/dutil/inc/butil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
diff --git a/src/dutil/inc/cabcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/cabcutil.h
index 4f0c7b13..4f0c7b13 100644
--- a/src/dutil/inc/cabcutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/cabcutil.h
diff --git a/src/dutil/inc/cabutil.h b/src/libs/dutil/WixToolset.DUtil/inc/cabutil.h
index 0bedba80..0bedba80 100644
--- a/src/dutil/inc/cabutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/cabutil.h
diff --git a/src/dutil/inc/certutil.h b/src/libs/dutil/WixToolset.DUtil/inc/certutil.h
index 8565c1cf..8565c1cf 100644
--- a/src/dutil/inc/certutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/certutil.h
diff --git a/src/dutil/inc/conutil.h b/src/libs/dutil/WixToolset.DUtil/inc/conutil.h
index 38aaea84..38aaea84 100644
--- a/src/dutil/inc/conutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/conutil.h
diff --git a/src/dutil/inc/cryputil.h b/src/libs/dutil/WixToolset.DUtil/inc/cryputil.h
index 02492d8a..02492d8a 100644
--- a/src/dutil/inc/cryputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/cryputil.h
diff --git a/src/dutil/inc/deputil.h b/src/libs/dutil/WixToolset.DUtil/inc/deputil.h
index bfe235f3..bfe235f3 100644
--- a/src/dutil/inc/deputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/deputil.h
diff --git a/src/dutil/inc/dictutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dictutil.h
index f0a3bb5a..f0a3bb5a 100644
--- a/src/dutil/inc/dictutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dictutil.h
diff --git a/src/dutil/inc/dirutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
index 539b3a73..539b3a73 100644
--- a/src/dutil/inc/dirutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
diff --git a/src/dutil/inc/dlutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dlutil.h
index 3e95103a..3e95103a 100644
--- a/src/dutil/inc/dlutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dlutil.h
diff --git a/src/dutil/inc/dpiutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dpiutil.h
index b30e2332..b30e2332 100644
--- a/src/dutil/inc/dpiutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dpiutil.h
diff --git a/src/dutil/inc/dutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
index fc9ec0f4..fc9ec0f4 100644
--- a/src/dutil/inc/dutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
diff --git a/src/dutil/inc/dutilsources.h b/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
index 7d512cb3..7d512cb3 100644
--- a/src/dutil/inc/dutilsources.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
diff --git a/src/dutil/inc/eseutil.h b/src/libs/dutil/WixToolset.DUtil/inc/eseutil.h
index bea47b2b..bea47b2b 100644
--- a/src/dutil/inc/eseutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/eseutil.h
diff --git a/src/dutil/inc/fileutil.h b/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
index d3e326f7..d3e326f7 100644
--- a/src/dutil/inc/fileutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
diff --git a/src/dutil/inc/gdiputil.h b/src/libs/dutil/WixToolset.DUtil/inc/gdiputil.h
index f2145828..f2145828 100644
--- a/src/dutil/inc/gdiputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/gdiputil.h
diff --git a/src/dutil/inc/guidutil.h b/src/libs/dutil/WixToolset.DUtil/inc/guidutil.h
index 478a464f..478a464f 100644
--- a/src/dutil/inc/guidutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/guidutil.h
diff --git a/src/dutil/inc/iis7util.h b/src/libs/dutil/WixToolset.DUtil/inc/iis7util.h
index 3572b4e9..3572b4e9 100644
--- a/src/dutil/inc/iis7util.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/iis7util.h
diff --git a/src/dutil/inc/inetutil.h b/src/libs/dutil/WixToolset.DUtil/inc/inetutil.h
index 19ace88b..19ace88b 100644
--- a/src/dutil/inc/inetutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/inetutil.h
diff --git a/src/dutil/inc/iniutil.h b/src/libs/dutil/WixToolset.DUtil/inc/iniutil.h
index c8503155..c8503155 100644
--- a/src/dutil/inc/iniutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/iniutil.h
diff --git a/src/dutil/inc/jsonutil.h b/src/libs/dutil/WixToolset.DUtil/inc/jsonutil.h
index b05e9970..b05e9970 100644
--- a/src/dutil/inc/jsonutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/jsonutil.h
diff --git a/src/dutil/inc/locutil.h b/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
index 38ddda20..38ddda20 100644
--- a/src/dutil/inc/locutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
diff --git a/src/dutil/inc/logutil.h b/src/libs/dutil/WixToolset.DUtil/inc/logutil.h
index 426506ee..426506ee 100644
--- a/src/dutil/inc/logutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/logutil.h
diff --git a/src/dutil/inc/memutil.h b/src/libs/dutil/WixToolset.DUtil/inc/memutil.h
index 49f86e0a..49f86e0a 100644
--- a/src/dutil/inc/memutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/memutil.h
diff --git a/src/dutil/inc/metautil.h b/src/libs/dutil/WixToolset.DUtil/inc/metautil.h
index 31f9ff5c..31f9ff5c 100644
--- a/src/dutil/inc/metautil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/metautil.h
diff --git a/src/dutil/inc/monutil.h b/src/libs/dutil/WixToolset.DUtil/inc/monutil.h
index f644e205..f644e205 100644
--- a/src/dutil/inc/monutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/monutil.h
diff --git a/src/dutil/inc/osutil.h b/src/libs/dutil/WixToolset.DUtil/inc/osutil.h
index 2cce6f63..2cce6f63 100644
--- a/src/dutil/inc/osutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/osutil.h
diff --git a/src/dutil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
index 579b8454..579b8454 100644
--- a/src/dutil/inc/pathutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
diff --git a/src/dutil/inc/perfutil.h b/src/libs/dutil/WixToolset.DUtil/inc/perfutil.h
index 7557511d..7557511d 100644
--- a/src/dutil/inc/perfutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/perfutil.h
diff --git a/src/dutil/inc/polcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
index 13618043..13618043 100644
--- a/src/dutil/inc/polcutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
diff --git a/src/dutil/inc/procutil.h b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
index 00f3f358..00f3f358 100644
--- a/src/dutil/inc/procutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
diff --git a/src/dutil/inc/regutil.h b/src/libs/dutil/WixToolset.DUtil/inc/regutil.h
index 75284940..75284940 100644
--- a/src/dutil/inc/regutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/regutil.h
diff --git a/src/dutil/inc/resrutil.h b/src/libs/dutil/WixToolset.DUtil/inc/resrutil.h
index 1f4d8e17..1f4d8e17 100644
--- a/src/dutil/inc/resrutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/resrutil.h
diff --git a/src/dutil/inc/reswutil.h b/src/libs/dutil/WixToolset.DUtil/inc/reswutil.h
index 31435ae2..31435ae2 100644
--- a/src/dutil/inc/reswutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/reswutil.h
diff --git a/src/dutil/inc/rexutil.h b/src/libs/dutil/WixToolset.DUtil/inc/rexutil.h
index 77f5604a..77f5604a 100644
--- a/src/dutil/inc/rexutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/rexutil.h
diff --git a/src/dutil/inc/rmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/rmutil.h
index ce7bf254..ce7bf254 100644
--- a/src/dutil/inc/rmutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/rmutil.h
diff --git a/src/dutil/inc/rssutil.h b/src/libs/dutil/WixToolset.DUtil/inc/rssutil.h
index 064ab147..064ab147 100644
--- a/src/dutil/inc/rssutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/rssutil.h
diff --git a/src/dutil/inc/sceutil.h b/src/libs/dutil/WixToolset.DUtil/inc/sceutil.h
index 9d14eecf..9d14eecf 100644
--- a/src/dutil/inc/sceutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/sceutil.h
diff --git a/src/dutil/inc/sczutil.h b/src/libs/dutil/WixToolset.DUtil/inc/sczutil.h
index fcfbd13a..fcfbd13a 100644
--- a/src/dutil/inc/sczutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/sczutil.h
diff --git a/src/dutil/inc/shelutil.h b/src/libs/dutil/WixToolset.DUtil/inc/shelutil.h
index 0b9f539d..0b9f539d 100644
--- a/src/dutil/inc/shelutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/shelutil.h
diff --git a/src/dutil/inc/sqlutil.h b/src/libs/dutil/WixToolset.DUtil/inc/sqlutil.h
index ddf09323..ddf09323 100644
--- a/src/dutil/inc/sqlutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/sqlutil.h
diff --git a/src/dutil/inc/srputil.h b/src/libs/dutil/WixToolset.DUtil/inc/srputil.h
index 95e96231..95e96231 100644
--- a/src/dutil/inc/srputil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/srputil.h
diff --git a/src/dutil/inc/strutil.h b/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
index 1cff9ab8..1cff9ab8 100644
--- a/src/dutil/inc/strutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
diff --git a/src/dutil/inc/svcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/svcutil.h
index 80d6326c..80d6326c 100644
--- a/src/dutil/inc/svcutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/svcutil.h
diff --git a/src/dutil/inc/thmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
index d3dd6d21..d3dd6d21 100644
--- a/src/dutil/inc/thmutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
diff --git a/src/dutil/inc/timeutil.h b/src/libs/dutil/WixToolset.DUtil/inc/timeutil.h
index 3655c00a..3655c00a 100644
--- a/src/dutil/inc/timeutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/timeutil.h
diff --git a/src/dutil/inc/uncutil.h b/src/libs/dutil/WixToolset.DUtil/inc/uncutil.h
index 6516a801..6516a801 100644
--- a/src/dutil/inc/uncutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/uncutil.h
diff --git a/src/dutil/inc/uriutil.h b/src/libs/dutil/WixToolset.DUtil/inc/uriutil.h
index d6dfdd6b..d6dfdd6b 100644
--- a/src/dutil/inc/uriutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/uriutil.h
diff --git a/src/dutil/inc/userutil.h b/src/libs/dutil/WixToolset.DUtil/inc/userutil.h
index 2c86d229..2c86d229 100644
--- a/src/dutil/inc/userutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/userutil.h
diff --git a/src/dutil/inc/verutil.h b/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
index 5247bb61..5247bb61 100644
--- a/src/dutil/inc/verutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
diff --git a/src/dutil/inc/wiutil.h b/src/libs/dutil/WixToolset.DUtil/inc/wiutil.h
index 9c2de209..9c2de209 100644
--- a/src/dutil/inc/wiutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/wiutil.h
diff --git a/src/dutil/inc/wuautil.h b/src/libs/dutil/WixToolset.DUtil/inc/wuautil.h
index b239c4e6..b239c4e6 100644
--- a/src/dutil/inc/wuautil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/wuautil.h
diff --git a/src/dutil/inc/xmlutil.h b/src/libs/dutil/WixToolset.DUtil/inc/xmlutil.h
index ba92ada9..ba92ada9 100644
--- a/src/dutil/inc/xmlutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/xmlutil.h
diff --git a/src/dutil/inetutil.cpp b/src/libs/dutil/WixToolset.DUtil/inetutil.cpp
index 8dace55f..8dace55f 100644
--- a/src/dutil/inetutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/inetutil.cpp
diff --git a/src/dutil/iniutil.cpp b/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
index 70b62995..70b62995 100644
--- a/src/dutil/iniutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
diff --git a/src/dutil/jsonutil.cpp b/src/libs/dutil/WixToolset.DUtil/jsonutil.cpp
index 3450ba59..3450ba59 100644
--- a/src/dutil/jsonutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/jsonutil.cpp
diff --git a/src/dutil/locutil.cpp b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
index c4567c03..c4567c03 100644
--- a/src/dutil/locutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
diff --git a/src/dutil/logutil.cpp b/src/libs/dutil/WixToolset.DUtil/logutil.cpp
index ac68036a..ac68036a 100644
--- a/src/dutil/logutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/logutil.cpp
diff --git a/src/dutil/memutil.cpp b/src/libs/dutil/WixToolset.DUtil/memutil.cpp
index c805a9c0..c805a9c0 100644
--- a/src/dutil/memutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/memutil.cpp
diff --git a/src/dutil/metautil.cpp b/src/libs/dutil/WixToolset.DUtil/metautil.cpp
index f313fc1c..f313fc1c 100644
--- a/src/dutil/metautil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/metautil.cpp
diff --git a/src/dutil/monutil.cpp b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
index 6a7f0596..6a7f0596 100644
--- a/src/dutil/monutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
diff --git a/src/dutil/osutil.cpp b/src/libs/dutil/WixToolset.DUtil/osutil.cpp
index 880ec3ea..880ec3ea 100644
--- a/src/dutil/osutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/osutil.cpp
diff --git a/src/dutil/packages.config b/src/libs/dutil/WixToolset.DUtil/packages.config
index 5bbcd994..5bbcd994 100644
--- a/src/dutil/packages.config
+++ b/src/libs/dutil/WixToolset.DUtil/packages.config
diff --git a/src/dutil/path2utl.cpp b/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
index ff3a946d..ff3a946d 100644
--- a/src/dutil/path2utl.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
diff --git a/src/dutil/pathutil.cpp b/src/libs/dutil/WixToolset.DUtil/pathutil.cpp
index 7c3cfe06..7c3cfe06 100644
--- a/src/dutil/pathutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/pathutil.cpp
diff --git a/src/dutil/perfutil.cpp b/src/libs/dutil/WixToolset.DUtil/perfutil.cpp
index bc138d34..bc138d34 100644
--- a/src/dutil/perfutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/perfutil.cpp
diff --git a/src/dutil/polcutil.cpp b/src/libs/dutil/WixToolset.DUtil/polcutil.cpp
index 1fdfa18c..1fdfa18c 100644
--- a/src/dutil/polcutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/polcutil.cpp
diff --git a/src/dutil/precomp.h b/src/libs/dutil/WixToolset.DUtil/precomp.h
index f8f3b944..f8f3b944 100644
--- a/src/dutil/precomp.h
+++ b/src/libs/dutil/WixToolset.DUtil/precomp.h
diff --git a/src/dutil/proc2utl.cpp b/src/libs/dutil/WixToolset.DUtil/proc2utl.cpp
index a59d2ffc..a59d2ffc 100644
--- a/src/dutil/proc2utl.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/proc2utl.cpp
diff --git a/src/dutil/proc3utl.cpp b/src/libs/dutil/WixToolset.DUtil/proc3utl.cpp
index 6d3cbc67..6d3cbc67 100644
--- a/src/dutil/proc3utl.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/proc3utl.cpp
diff --git a/src/dutil/procutil.cpp b/src/libs/dutil/WixToolset.DUtil/procutil.cpp
index 6bfe5017..6bfe5017 100644
--- a/src/dutil/procutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/procutil.cpp
diff --git a/src/dutil/regutil.cpp b/src/libs/dutil/WixToolset.DUtil/regutil.cpp
index cb617932..cb617932 100644
--- a/src/dutil/regutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/regutil.cpp
diff --git a/src/dutil/resrutil.cpp b/src/libs/dutil/WixToolset.DUtil/resrutil.cpp
index a6a7ee23..a6a7ee23 100644
--- a/src/dutil/resrutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/resrutil.cpp
diff --git a/src/dutil/reswutil.cpp b/src/libs/dutil/WixToolset.DUtil/reswutil.cpp
index e78de84a..e78de84a 100644
--- a/src/dutil/reswutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/reswutil.cpp
diff --git a/src/dutil/rexutil.cpp b/src/libs/dutil/WixToolset.DUtil/rexutil.cpp
index 155ca714..155ca714 100644
--- a/src/dutil/rexutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/rexutil.cpp
diff --git a/src/dutil/rmutil.cpp b/src/libs/dutil/WixToolset.DUtil/rmutil.cpp
index 95c8c8a4..95c8c8a4 100644
--- a/src/dutil/rmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/rmutil.cpp
diff --git a/src/dutil/rssutil.cpp b/src/libs/dutil/WixToolset.DUtil/rssutil.cpp
index 8f994dfc..8f994dfc 100644
--- a/src/dutil/rssutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/rssutil.cpp
diff --git a/src/dutil/sceutil.cpp b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
index cdb1623b..cdb1623b 100644
--- a/src/dutil/sceutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
diff --git a/src/dutil/shelutil.cpp b/src/libs/dutil/WixToolset.DUtil/shelutil.cpp
index 2eb9a52a..2eb9a52a 100644
--- a/src/dutil/shelutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/shelutil.cpp
diff --git a/src/dutil/sqlutil.cpp b/src/libs/dutil/WixToolset.DUtil/sqlutil.cpp
index 782c7088..782c7088 100644
--- a/src/dutil/sqlutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/sqlutil.cpp
diff --git a/src/dutil/srputil.cpp b/src/libs/dutil/WixToolset.DUtil/srputil.cpp
index e44536cc..e44536cc 100644
--- a/src/dutil/srputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/srputil.cpp
diff --git a/src/dutil/strutil.cpp b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
index 550d6169..550d6169 100644
--- a/src/dutil/strutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
diff --git a/src/dutil/svcutil.cpp b/src/libs/dutil/WixToolset.DUtil/svcutil.cpp
index 1a39bfee..1a39bfee 100644
--- a/src/dutil/svcutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/svcutil.cpp
diff --git a/src/dutil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index d200a0ea..d200a0ea 100644
--- a/src/dutil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
diff --git a/src/dutil/timeutil.cpp b/src/libs/dutil/WixToolset.DUtil/timeutil.cpp
index b7953c94..b7953c94 100644
--- a/src/dutil/timeutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/timeutil.cpp
diff --git a/src/dutil/uncutil.cpp b/src/libs/dutil/WixToolset.DUtil/uncutil.cpp
index 415ea198..415ea198 100644
--- a/src/dutil/uncutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/uncutil.cpp
diff --git a/src/dutil/uriutil.cpp b/src/libs/dutil/WixToolset.DUtil/uriutil.cpp
index 7913c22e..7913c22e 100644
--- a/src/dutil/uriutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/uriutil.cpp
diff --git a/src/dutil/userutil.cpp b/src/libs/dutil/WixToolset.DUtil/userutil.cpp
index ca6d5480..ca6d5480 100644
--- a/src/dutil/userutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/userutil.cpp
diff --git a/src/dutil/verutil.cpp b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
index 21626f94..21626f94 100644
--- a/src/dutil/verutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
diff --git a/src/dutil/wiutil.cpp b/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
index 7414ac42..7414ac42 100644
--- a/src/dutil/wiutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
diff --git a/src/dutil/wuautil.cpp b/src/libs/dutil/WixToolset.DUtil/wuautil.cpp
index dfb28818..dfb28818 100644
--- a/src/dutil/wuautil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/wuautil.cpp
diff --git a/src/dutil/xmlutil.cpp b/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
index 0f1e611d..0f1e611d 100644
--- a/src/dutil/xmlutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
diff --git a/src/dutil/xsd/thmutil.xsd b/src/libs/dutil/WixToolset.DUtil/xsd/thmutil.xsd
index 46c20e4a..46c20e4a 100644
--- a/src/dutil/xsd/thmutil.xsd
+++ b/src/libs/dutil/WixToolset.DUtil/xsd/thmutil.xsd
diff --git a/src/libs/dutil/appveyor.cmd b/src/libs/dutil/appveyor.cmd
new file mode 100644
index 00000000..85476b8e
--- /dev/null
+++ b/src/libs/dutil/appveyor.cmd
@@ -0,0 +1,24 @@
+@setlocal
+@pushd %~dp0
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
+
+nuget restore || exit /b
+
+msbuild -t:Test -p:Configuration=%_C% src\test\DUtilUnitTest || exit /b
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b
+
+msbuild -p:Configuration=%_C% -t:PackNative src\dutil\dutil.vcxproj || exit /b
+
+@popd
+@endlocal
\ No newline at end of file
diff --git a/src/libs/dutil/appveyor.yml b/src/libs/dutil/appveyor.yml
new file mode 100644
index 00000000..f602d07c
--- /dev/null
+++ b/src/libs/dutil/appveyor.yml
@@ -0,0 +1,44 @@
+# 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
+
+test: off
+
+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\**\*.msi
+  name: msi
+
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/libs/dutil/dutil.sln b/src/libs/dutil/dutil.sln
new file mode 100644
index 00000000..433f42a5
--- /dev/null
+++ b/src/libs/dutil/dutil.sln
@@ -0,0 +1,47 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30711.63
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "src\dutil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "src\test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|ARM64 = Debug|ARM64
+                Debug|x64 = Debug|x64
+                Debug|x86 = Debug|x86
+                Release|ARM64 = Release|ARM64
+                Release|x64 = Release|x64
+                Release|x86 = Release|x86
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.Build.0 = Debug|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.ActiveCfg = Debug|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.Build.0 = Debug|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.ActiveCfg = Debug|Win32
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.Build.0 = Debug|Win32
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.ActiveCfg = Release|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.Build.0 = Release|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.ActiveCfg = Release|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.Build.0 = Release|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.ActiveCfg = Release|Win32
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.Build.0 = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|ARM64.ActiveCfg = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x64.ActiveCfg = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.ActiveCfg = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.Build.0 = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|ARM64.ActiveCfg = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x64.ActiveCfg = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.ActiveCfg = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.Build.0 = Release|Win32
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {DD209744-C40E-4C34-8CB4-BC6B71F9A133}
+        EndGlobalSection
+EndGlobal
diff --git a/src/libs/dutil/nuget.config b/src/libs/dutil/nuget.config
new file mode 100644
index 00000000..d5ef8952
--- /dev/null
+++ b/src/libs/dutil/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <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/DUtilUnitTest/ApupUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/ApupUtilTests.cpp
index 30a45f5a..30a45f5a 100644
--- a/src/test/DUtilUnitTest/ApupUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/ApupUtilTests.cpp
diff --git a/src/test/DUtilUnitTest/AssemblyInfo.cpp b/src/libs/dutil/test/DUtilUnitTest/AssemblyInfo.cpp
index 2d527910..2d527910 100644
--- a/src/test/DUtilUnitTest/AssemblyInfo.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/AssemblyInfo.cpp
diff --git a/src/test/DUtilUnitTest/DUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
index 55e81d46..55e81d46 100644
--- a/src/test/DUtilUnitTest/DUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index 18410e5d..18410e5d 100644
--- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index 4df7af89..4df7af89 100644
--- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
diff --git a/src/test/DUtilUnitTest/DictUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/DictUtilTest.cpp
index 4b4777d7..4b4777d7 100644
--- a/src/test/DUtilUnitTest/DictUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/DictUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/DirUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/DirUtilTests.cpp
index 7643366f..7643366f 100644
--- a/src/test/DUtilUnitTest/DirUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/DirUtilTests.cpp
diff --git a/src/test/DUtilUnitTest/FileUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
index ac071ef2..ac071ef2 100644
--- a/src/test/DUtilUnitTest/FileUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/GuidUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/GuidUtilTest.cpp
index a6e27a09..a6e27a09 100644
--- a/src/test/DUtilUnitTest/GuidUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/GuidUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/IniUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/IniUtilTest.cpp
index 946f19c5..946f19c5 100644
--- a/src/test/DUtilUnitTest/IniUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/IniUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/MemUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/MemUtilTest.cpp
index 09692bfb..09692bfb 100644
--- a/src/test/DUtilUnitTest/MemUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/MemUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/MonUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
index 273f2eb6..273f2eb6 100644
--- a/src/test/DUtilUnitTest/MonUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/PathUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
index 5a1f06fd..5a1f06fd 100644
--- a/src/test/DUtilUnitTest/PathUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/SceUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/SceUtilTest.cpp
index 75b9222a..75b9222a 100644
--- a/src/test/DUtilUnitTest/SceUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/SceUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/StrUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
index 94fee280..94fee280 100644
--- a/src/test/DUtilUnitTest/StrUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml b/src/libs/dutil/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml
index d9f961fe..d9f961fe 100644
--- a/src/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml
+++ b/src/libs/dutil/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml
diff --git a/src/test/DUtilUnitTest/UnitTest.rc b/src/libs/dutil/test/DUtilUnitTest/UnitTest.rc
index 14cebe1a..14cebe1a 100644
--- a/src/test/DUtilUnitTest/UnitTest.rc
+++ b/src/libs/dutil/test/DUtilUnitTest/UnitTest.rc
diff --git a/src/test/DUtilUnitTest/UriUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/UriUtilTest.cpp
index b3bf87a2..b3bf87a2 100644
--- a/src/test/DUtilUnitTest/UriUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/UriUtilTest.cpp
diff --git a/src/test/DUtilUnitTest/VerUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
index 8f24ad1a..8f24ad1a 100644
--- a/src/test/DUtilUnitTest/VerUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
diff --git a/src/test/DUtilUnitTest/error.cpp b/src/libs/dutil/test/DUtilUnitTest/error.cpp
index e51971c3..e51971c3 100644
--- a/src/test/DUtilUnitTest/error.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/error.cpp
diff --git a/src/test/DUtilUnitTest/error.h b/src/libs/dutil/test/DUtilUnitTest/error.h
index b973acaf..b973acaf 100644
--- a/src/test/DUtilUnitTest/error.h
+++ b/src/libs/dutil/test/DUtilUnitTest/error.h
diff --git a/src/test/DUtilUnitTest/packages.config b/src/libs/dutil/test/DUtilUnitTest/packages.config
index a4fef2bf..a4fef2bf 100644
--- a/src/test/DUtilUnitTest/packages.config
+++ b/src/libs/dutil/test/DUtilUnitTest/packages.config
diff --git a/src/test/DUtilUnitTest/precomp.cpp b/src/libs/dutil/test/DUtilUnitTest/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/test/DUtilUnitTest/precomp.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.cpp
diff --git a/src/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
index e9f8770b..e9f8770b 100644
--- a/src/test/DUtilUnitTest/precomp.h
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
diff --git a/src/test/DUtilUnitTest/resource.h b/src/libs/dutil/test/DUtilUnitTest/resource.h
index bdf252f6..bdf252f6 100644
--- a/src/test/DUtilUnitTest/resource.h
+++ b/src/libs/dutil/test/DUtilUnitTest/resource.h
diff --git a/src/signing.json b/src/signing.json
new file mode 100644
index 00000000..fe1c8c9b
--- /dev/null
+++ b/src/signing.json
@@ -0,0 +1,13 @@
+{
+  "SignClient": {
+    "AzureAd": {
+      "AADInstance": "https://login.microsoftonline.com/",
+      "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
+      "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
+    },
+    "Service": {
+      "Url": "https://codesign.dotnetfoundation.org/",
+      "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
+    }
+  }
+}
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
+    }
+  }
+}