Create WixTestTools project and reorganize files.

23 files changed, 56 insertions, 13 deletions

diff --git a/BurnE2ETests.sln b/BurnE2ETests.sln
index ad94234c..aa259184 100644
--- a/BurnE2ETests.sln
+++ b/BurnE2ETests.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29503.13
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "src\Utilities\TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "src\TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "src\WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "src\WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}"
 EndProject
@@ -29,6 +31,18 @@ Global
                 {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x64.Build.0 = Release|Any CPU
                 {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x86.ActiveCfg = Release|Any CPU
                 {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x86.Build.0 = Release|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.Build.0 = Debug|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.Build.0 = Debug|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.Build.0 = Release|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.ActiveCfg = Release|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.Build.0 = Release|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.ActiveCfg = Release|Any CPU
+                {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.Build.0 = Release|Any CPU
                 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU
                 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/src/Utilities/TestBA/Hresult.cs b/src/TestBA/Hresult.cs
index bc1aa8c0..bc1aa8c0 100644
--- a/src/Utilities/TestBA/Hresult.cs
+++ b/src/TestBA/Hresult.cs
diff --git a/src/Utilities/TestBA/TestBA.BootstrapperCore.config b/src/TestBA/TestBA.BootstrapperCore.config
index 55876a00..55876a00 100644
--- a/src/Utilities/TestBA/TestBA.BootstrapperCore.config
+++ b/src/TestBA/TestBA.BootstrapperCore.config
diff --git a/src/Utilities/TestBA/TestBA.cs b/src/TestBA/TestBA.cs
index 1348ce98..1348ce98 100644
--- a/src/Utilities/TestBA/TestBA.cs
+++ b/src/TestBA/TestBA.cs
diff --git a/src/Utilities/TestBA/TestBA.csproj b/src/TestBA/TestBA.csproj
index b6aea84b..b6aea84b 100644
--- a/src/Utilities/TestBA/TestBA.csproj
+++ b/src/TestBA/TestBA.csproj
diff --git a/src/Utilities/TestBA/TestBAFactory.cs b/src/TestBA/TestBAFactory.cs
index ba1de367..ba1de367 100644
--- a/src/Utilities/TestBA/TestBAFactory.cs
+++ b/src/TestBA/TestBAFactory.cs
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 71ff3cb1..85ad69b3 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -10,7 +10,7 @@
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
+    <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
diff --git a/src/WixToolsetTest.BurnE2E/BundleInstaller.cs b/src/WixTestTools/BundleInstaller.cs
index 923618b9..044486fe 100644
--- a/src/WixToolsetTest.BurnE2E/BundleInstaller.cs
+++ b/src/WixTestTools/BundleInstaller.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.IO;
diff --git a/src/WixToolsetTest.BurnE2E/BundleRegistration.cs b/src/WixTestTools/BundleRegistration.cs
index 6d20a0b2..d473dcdd 100644
--- a/src/WixToolsetTest.BurnE2E/BundleRegistration.cs
+++ b/src/WixTestTools/BundleRegistration.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using Microsoft.Win32;
diff --git a/src/WixToolsetTest.BurnE2E/BundleVerifier.cs b/src/WixTestTools/BundleVerifier.cs
index 98ec96a0..96c86fdf 100644
--- a/src/WixToolsetTest.BurnE2E/BundleVerifier.cs
+++ b/src/WixTestTools/BundleVerifier.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.IO;
diff --git a/src/WixToolsetTest.BurnE2E/MSIExec.cs b/src/WixTestTools/MSIExec.cs
index 659d91ea..8dce96cf 100644
--- a/src/WixToolsetTest.BurnE2E/MSIExec.cs
+++ b/src/WixTestTools/MSIExec.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.IO;
diff --git a/src/WixToolsetTest.BurnE2E/MsiUtilities.cs b/src/WixTestTools/MsiUtilities.cs
index 1a9f0925..2a848938 100644
--- a/src/WixToolsetTest.BurnE2E/MsiUtilities.cs
+++ b/src/WixTestTools/MsiUtilities.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using WixToolset.Dtf.WindowsInstaller;
 
diff --git a/src/WixToolsetTest.BurnE2E/PackageInstaller.cs b/src/WixTestTools/PackageInstaller.cs
index c3516fe7..86376b9f 100644
--- a/src/WixToolsetTest.BurnE2E/PackageInstaller.cs
+++ b/src/WixTestTools/PackageInstaller.cs
@@ -1,10 +1,10 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.IO;
-    using static WixToolsetTest.BurnE2E.MSIExec;
+    using static WixTestTools.MSIExec;
 
     public partial class PackageInstaller : IDisposable
     {
diff --git a/src/WixToolsetTest.BurnE2E/PackageVerifier.cs b/src/WixTestTools/PackageVerifier.cs
index 7a4fea88..77946c91 100644
--- a/src/WixToolsetTest.BurnE2E/PackageVerifier.cs
+++ b/src/WixTestTools/PackageVerifier.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.IO;
diff --git a/src/WixToolsetTest.BurnE2E/TestTool.cs b/src/WixTestTools/TestTool.cs
index e35c5c4b..be5fde42 100644
--- a/src/WixToolsetTest.BurnE2E/TestTool.cs
+++ b/src/WixTestTools/TestTool.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/WixToolsetTest.BurnE2E/WixTestBase.cs b/src/WixTestTools/WixTestBase.cs
index 650b0681..bc050135 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestBase.cs
+++ b/src/WixTestTools/WixTestBase.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using Xunit.Abstractions;
 
diff --git a/src/WixToolsetTest.BurnE2E/WixTestContext.cs b/src/WixTestTools/WixTestContext.cs
index 0ae99a77..c00f5723 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestContext.cs
+++ b/src/WixTestTools/WixTestContext.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolsetTest.BurnE2E
+namespace WixTestTools
 {
     using System;
     using System.IO;
diff --git a/src/WixTestTools/WixTestTools.csproj b/src/WixTestTools/WixTestTools.csproj
new file mode 100644
index 00000000..0a2db104
--- /dev/null
+++ b/src/WixTestTools/WixTestTools.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
+    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
+    <PackageReference Include="WixToolset.Data" Version="4.0.185" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.48" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit" Version="2.4.1" />
+  </ItemGroup>
+</Project>
diff --git a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
index d3400658..c9294f73 100644
--- a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
+++ b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using System.Collections.Generic;
+    using WixTestTools;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/WixToolsetTest.BurnE2E/FailureTests.cs b/src/WixToolsetTest.BurnE2E/FailureTests.cs
index ba6e5ba4..bc505527 100644
--- a/src/WixToolsetTest.BurnE2E/FailureTests.cs
+++ b/src/WixToolsetTest.BurnE2E/FailureTests.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolsetTest.BurnE2E
 {
+    using WixTestTools;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
index 6d8f1536..3d9748bb 100644
--- a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
+++ b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using System.IO;
+    using WixTestTools;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/WixToolsetTest.BurnE2E/TestBAController.cs b/src/WixToolsetTest.BurnE2E/TestBAController.cs
index 91d1b817..1b254656 100644
--- a/src/WixToolsetTest.BurnE2E/TestBAController.cs
+++ b/src/WixToolsetTest.BurnE2E/TestBAController.cs
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using Microsoft.Win32;
+    using WixTestTools;
     using WixToolset.Mba.Core;
 
     public class TestBAController : IDisposable
diff --git a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index b3cf427f..5217826e 100644
--- a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -13,6 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\WixTestTools\WixTestTools.csproj"  />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />