Move Converters into wix

69 files changed, 219 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/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
+    }
+  }
+}
diff --git a/src/Directory.Build.props b/src/wix/Directory.Build.props
index b3c6287c..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/wix/Directory.Build.props
diff --git a/src/Directory.Build.targets b/src/wix/Directory.Build.targets
index 2fcc765a..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/wix/Directory.Build.targets
diff --git a/src/Directory.csproj.props b/src/wix/Directory.csproj.props
index 81d24ad1..81d24ad1 100644
--- a/src/Directory.csproj.props
+++ b/src/wix/Directory.csproj.props
diff --git a/src/Directory.csproj.targets b/src/wix/Directory.csproj.targets
index c3270426..c3270426 100644
--- a/src/Directory.csproj.targets
+++ b/src/wix/Directory.csproj.targets
diff --git a/src/wix/README.md b/src/wix/README.md
new file mode 100644
index 00000000..f031cf7c
--- /dev/null
+++ b/src/wix/README.md
@@ -0,0 +1,2 @@
+# Converters
+WixToolset.Converters, conversion related functionality
diff --git a/src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs b/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
index 6418b2a6..6418b2a6 100644
--- a/src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
+++ b/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
diff --git a/src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
index 445c3500..445c3500 100644
--- a/src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+++ b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
diff --git a/src/wix/WixToolset.Converters.sln b/src/wix/WixToolset.Converters.sln
new file mode 100644
index 00000000..ae8a3d92
--- /dev/null
+++ b/src/wix/WixToolset.Converters.sln
@@ -0,0 +1,85 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Converters", "WixToolset.Converters\WixToolset.Converters.csproj", "{6FAF6385-6598-4B89-972B-C31AFCA14538}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Converters.Symbolizer", "WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj", "{F051BCAF-698C-41D5-8427-164537CE5C5C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1B16A6C1-2B5D-4F9A-9DD5-FBC89B3CE31E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Converters", "test\WixToolsetTest.Converters\WixToolsetTest.Converters.csproj", "{485C5038-97E1-4729-A54D-848CC69569FD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Converters.Symbolizer", "test\WixToolsetTest.Converters.Symbolizer\WixToolsetTest.Converters.Symbolizer.csproj", "{9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}"
+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
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x64.Build.0 = Debug|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x86.Build.0 = Debug|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x64.ActiveCfg = Release|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x64.Build.0 = Release|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x86.ActiveCfg = Release|Any CPU
+                {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x86.Build.0 = Release|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x64.Build.0 = Debug|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x86.Build.0 = Debug|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|Any CPU.Build.0 = Release|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x64.ActiveCfg = Release|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x64.Build.0 = Release|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x86.ActiveCfg = Release|Any CPU
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x86.Build.0 = Release|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x64.Build.0 = Debug|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x86.Build.0 = Debug|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x64.ActiveCfg = Release|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x64.Build.0 = Release|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x86.ActiveCfg = Release|Any CPU
+                {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x86.Build.0 = Release|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x64.Build.0 = Debug|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x86.Build.0 = Debug|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Release|Any CPU.Build.0 = Release|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x64.ActiveCfg = Release|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x64.Build.0 = Release|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x86.ActiveCfg = Release|Any CPU
+                {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x86.Build.0 = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(NestedProjects) = preSolution
+                {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C} = {1B16A6C1-2B5D-4F9A-9DD5-FBC89B3CE31E}
+                {485C5038-97E1-4729-A54D-848CC69569FD} = {1B16A6C1-2B5D-4F9A-9DD5-FBC89B3CE31E}
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {2E71F0EC-CF75-44DA-8353-7066EBD06564}
+        EndGlobalSection
+EndGlobal
diff --git a/src/wix/WixToolset.Converters.v3.ncrunchsolution b/src/wix/WixToolset.Converters.v3.ncrunchsolution
new file mode 100644
index 00000000..f774ab93
--- /dev/null
+++ b/src/wix/WixToolset.Converters.v3.ncrunchsolution
@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>False</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/WixToolset.Converters/ConvertCommand.cs b/src/wix/WixToolset.Converters/ConvertCommand.cs
index b6826f43..b6826f43 100644
--- a/src/WixToolset.Converters/ConvertCommand.cs
+++ b/src/wix/WixToolset.Converters/ConvertCommand.cs
diff --git a/src/WixToolset.Converters/ConverterExtensionCommandLine.cs b/src/wix/WixToolset.Converters/ConverterExtensionCommandLine.cs
index 06d3658c..06d3658c 100644
--- a/src/WixToolset.Converters/ConverterExtensionCommandLine.cs
+++ b/src/wix/WixToolset.Converters/ConverterExtensionCommandLine.cs
diff --git a/src/WixToolset.Converters/ConverterExtensionFactory.cs b/src/wix/WixToolset.Converters/ConverterExtensionFactory.cs
index d4f480aa..d4f480aa 100644
--- a/src/WixToolset.Converters/ConverterExtensionFactory.cs
+++ b/src/wix/WixToolset.Converters/ConverterExtensionFactory.cs
diff --git a/src/WixToolset.Converters/FixupCommandBase.cs b/src/wix/WixToolset.Converters/FixupCommandBase.cs
index 21282d07..21282d07 100644
--- a/src/WixToolset.Converters/FixupCommandBase.cs
+++ b/src/wix/WixToolset.Converters/FixupCommandBase.cs
diff --git a/src/WixToolset.Converters/FormatCommand.cs b/src/wix/WixToolset.Converters/FormatCommand.cs
index 0861fc51..0861fc51 100644
--- a/src/WixToolset.Converters/FormatCommand.cs
+++ b/src/wix/WixToolset.Converters/FormatCommand.cs
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index e42d0605..e42d0605 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
diff --git a/src/WixToolset.Converters/WixToolset.Converters.csproj b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
index 7dddefa5..7dddefa5 100644
--- a/src/WixToolset.Converters/WixToolset.Converters.csproj
+++ b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
diff --git a/src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs b/src/wix/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
index 084d3b92..084d3b92 100644
--- a/src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
+++ b/src/wix/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
diff --git a/src/wix/appveyor.cmd b/src/wix/appveyor.cmd
new file mode 100644
index 00000000..02db695b
--- /dev/null
+++ b/src/wix/appveyor.cmd
@@ -0,0 +1,20 @@
+@setlocal
+@pushd %~dp0
+@set _P=%~dp0build\Release\publish
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
+
+:: Restore
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
+
+:: Build
+msbuild -p:Configuration=%_C% || exit /b
+
+:: Test
+dotnet test -c %_C% --no-build || exit /b
+
+:: Pack
+msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack || exit /b
+
+@popd
+@endlocal
diff --git a/src/wix/appveyor.yml b/src/wix/appveyor.yml
new file mode 100644
index 00000000..364569cf
--- /dev/null
+++ b/src/wix/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\**\*.snupkg
+  name: snupkg
+
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/deps/wix.dll b/src/wix/deps/wix.dll
index 64f70f75..64f70f75 100644
--- a/src/deps/wix.dll
+++ b/src/wix/deps/wix.dll
diff --git a/src/wix/nuget.config b/src/wix/nuget.config
new file mode 100644
index 00000000..31435a21
--- /dev/null
+++ b/src/wix/nuget.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
+    <add key="wixtoolset-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-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
+    <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
+    <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
+    <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.Converters.Symbolizer/ConvertSymbolsFixture.cs b/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs
index 01213524..01213524 100644
--- a/src/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs
diff --git a/src/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixout b/src/wix/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixout
index da64b8af..da64b8af 100644
--- a/src/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixout
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixout
diff --git a/src/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixproj
index d7c4e625..d7c4e625 100644
--- a/src/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixproj
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wixproj
diff --git a/src/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wxs b/src/wix/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wxs
index 46d4fb43..46d4fb43 100644
--- a/src/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wxs
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/TestData/Integration/test.wxs
diff --git a/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
index 995d9297..995d9297 100644
--- a/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
diff --git a/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.v3.ncrunchproject b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.v3.ncrunchproject
index 18ab4f79..18ab4f79 100644
--- a/src/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.v3.ncrunchproject
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.v3.ncrunchproject
diff --git a/src/test/WixToolsetTest.Converters/BaseConverterFixture.cs b/src/wix/test/WixToolsetTest.Converters/BaseConverterFixture.cs
index 2421d73b..2421d73b 100644
--- a/src/test/WixToolsetTest.Converters/BaseConverterFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/BaseConverterFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/BitnessFixture.cs b/src/wix/test/WixToolsetTest.Converters/BitnessFixture.cs
index e45a9388..e45a9388 100644
--- a/src/test/WixToolsetTest.Converters/BitnessFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/BitnessFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/BootstrapperApplicationFixture.cs b/src/wix/test/WixToolsetTest.Converters/BootstrapperApplicationFixture.cs
index 158ab3be..158ab3be 100644
--- a/src/test/WixToolsetTest.Converters/BootstrapperApplicationFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/BootstrapperApplicationFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
index d3f65aeb..d3f65aeb 100644
--- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
index 13df9da7..13df9da7 100644
--- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
index a39f6243..a39f6243 100644
--- a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs b/src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs
index eafc171a..eafc171a 100644
--- a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs b/src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs
index 2b81a863..2b81a863 100644
--- a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/DependencyFixture.cs b/src/wix/test/WixToolsetTest.Converters/DependencyFixture.cs
index 41ded927..41ded927 100644
--- a/src/test/WixToolsetTest.Converters/DependencyFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/DependencyFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/DirectoryFixture.cs b/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs
index 3c906320..3c906320 100644
--- a/src/test/WixToolsetTest.Converters/DirectoryFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/ExePackageFixture.cs b/src/wix/test/WixToolsetTest.Converters/ExePackageFixture.cs
index 0ee8d065..0ee8d065 100644
--- a/src/test/WixToolsetTest.Converters/ExePackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ExePackageFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/FeatureFixture.cs b/src/wix/test/WixToolsetTest.Converters/FeatureFixture.cs
index 1df94a81..1df94a81 100644
--- a/src/test/WixToolsetTest.Converters/FeatureFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/FeatureFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
index a101019b..a101019b 100644
--- a/src/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/FormatFixture.cs b/src/wix/test/WixToolsetTest.Converters/FormatFixture.cs
index 739fba66..739fba66 100644
--- a/src/test/WixToolsetTest.Converters/FormatFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/FormatFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/IncludeFixture.cs b/src/wix/test/WixToolsetTest.Converters/IncludeFixture.cs
index 2fd8244f..2fd8244f 100644
--- a/src/test/WixToolsetTest.Converters/IncludeFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/IncludeFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/Mocks/MockCoreServiceProvider.cs b/src/wix/test/WixToolsetTest.Converters/Mocks/MockCoreServiceProvider.cs
index b6bb8a40..b6bb8a40 100644
--- a/src/test/WixToolsetTest.Converters/Mocks/MockCoreServiceProvider.cs
+++ b/src/wix/test/WixToolsetTest.Converters/Mocks/MockCoreServiceProvider.cs
diff --git a/src/test/WixToolsetTest.Converters/Mocks/MockMessaging.cs b/src/wix/test/WixToolsetTest.Converters/Mocks/MockMessaging.cs
index 77821a1c..77821a1c 100644
--- a/src/test/WixToolsetTest.Converters/Mocks/MockMessaging.cs
+++ b/src/wix/test/WixToolsetTest.Converters/Mocks/MockMessaging.cs
diff --git a/src/test/WixToolsetTest.Converters/ProductPackageFixture.cs b/src/wix/test/WixToolsetTest.Converters/ProductPackageFixture.cs
index e01b9789..e01b9789 100644
--- a/src/test/WixToolsetTest.Converters/ProductPackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ProductPackageFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/PropertyFixture.cs b/src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs
index e50a6518..e50a6518 100644
--- a/src/test/WixToolsetTest.Converters/PropertyFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/RegistryFixture.cs b/src/wix/test/WixToolsetTest.Converters/RegistryFixture.cs
index 405f5416..405f5416 100644
--- a/src/test/WixToolsetTest.Converters/RegistryFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/RegistryFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/RemotePayloadFixture.cs b/src/wix/test/WixToolsetTest.Converters/RemotePayloadFixture.cs
index b2640e13..b2640e13 100644
--- a/src/test/WixToolsetTest.Converters/RemotePayloadFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/RemotePayloadFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/SequenceFixture.cs b/src/wix/test/WixToolsetTest.Converters/SequenceFixture.cs
index ec6c709b..ec6c709b 100644
--- a/src/test/WixToolsetTest.Converters/SequenceFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/SequenceFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/TagFixture.cs b/src/wix/test/WixToolsetTest.Converters/TagFixture.cs
index 5e07c83b..5e07c83b 100644
--- a/src/test/WixToolsetTest.Converters/TagFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/TagFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.msi b/src/wix/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.msi
index 0d7e1b21..0d7e1b21 100644
--- a/src/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.msi
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.msi
diff --git a/src/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.wxs
index 8c5027b4..8c5027b4 100644
--- a/src/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/PackageSummaryInformation/TypicalV3.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/PermissionEx/v3.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/PermissionEx/v3.wxs
index 9a739052..9a739052 100644
--- a/src/test/WixToolsetTest.Converters/TestData/PermissionEx/v3.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/PermissionEx/v3.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/PermissionEx/v4_expected.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/PermissionEx/v4_expected.wxs
index 6bf3c1ea..6bf3c1ea 100644
--- a/src/test/WixToolsetTest.Converters/TestData/PermissionEx/v4_expected.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/PermissionEx/v4_expected.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
index 8188d900..8188d900 100644
--- a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/Preprocessor.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/Preprocessor/Preprocessor.wxs
index 2eb908c2..2eb908c2 100644
--- a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/Preprocessor.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/Preprocessor/Preprocessor.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/wixcop.settings.xml b/src/wix/test/WixToolsetTest.Converters/TestData/Preprocessor/wixcop.settings.xml
index 9d3ad496..9d3ad496 100644
--- a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/wixcop.settings.xml
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/Preprocessor/wixcop.settings.xml
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v3.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec.bad/v3.wxs
index b0fcf9c9..b0fcf9c9 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v3.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec.bad/v3.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
index 95d2f618..95d2f618 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec/v3.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec/v3.wxs
index 8d81a758..8d81a758 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec/v3.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec/v3.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
index f24d3f8f..f24d3f8f 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
index 5bcdaf59..5bcdaf59 100644
--- a/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
diff --git a/src/test/WixToolsetTest.Converters/TestData/SingleFile/SingleFile.wxs b/src/wix/test/WixToolsetTest.Converters/TestData/SingleFile/SingleFile.wxs
index 310ae811..310ae811 100644
--- a/src/test/WixToolsetTest.Converters/TestData/SingleFile/SingleFile.wxs
+++ b/src/wix/test/WixToolsetTest.Converters/TestData/SingleFile/SingleFile.wxs
diff --git a/src/test/WixToolsetTest.Converters/UtilExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
index 10450c68..10450c68 100644
--- a/src/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/VariableFixture.cs b/src/wix/test/WixToolsetTest.Converters/VariableFixture.cs
index b7b7388f..b7b7388f 100644
--- a/src/test/WixToolsetTest.Converters/VariableFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/VariableFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/Wix4ConversionFixture.cs b/src/wix/test/WixToolsetTest.Converters/Wix4ConversionFixture.cs
index 16a68895..16a68895 100644
--- a/src/test/WixToolsetTest.Converters/Wix4ConversionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/Wix4ConversionFixture.cs
diff --git a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
index 29b02b95..29b02b95 100644
--- a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj