Remove "Fixture" from the test assembly name

19 files changed, 37 insertions, 6 deletions

diff --git a/WixToolset.Core.sln b/WixToolset.Core.sln
index 8771dc4c..66991379 100644
--- a/WixToolset.Core.sln
+++ b/WixToolset.Core.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core", "src\WixToolset.Core\WixToolset.Core.csproj", "{0B524850-5B9A-472B-85CC-D25920A1DFE1}"
 EndProject
@@ -12,6 +12,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.WindowsInst
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Burn", "src\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj", "{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BuildTasks", "src\test\WixToolsetTest.BuildTasks\WixToolsetTest.BuildTasks.csproj", "{044F32F1-64E4-410A-9AA8-DCFCCDD363BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.CoreIntegration", "src\test\WixToolsetTest.CoreIntegration\WixToolsetTest.CoreIntegration.csproj", "{E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}"
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Any CPU = Debug|Any CPU
@@ -82,6 +86,30 @@ Global
                 {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x64.Build.0 = Release|Any CPU
                 {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.ActiveCfg = Release|Any CPU
                 {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.Build.0 = Release|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x64.Build.0 = Debug|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x86.Build.0 = Debug|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|Any CPU.Build.0 = Release|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x64.ActiveCfg = Release|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x64.Build.0 = Release|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x86.ActiveCfg = Release|Any CPU
+                {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x86.Build.0 = Release|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.Build.0 = Debug|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.Build.0 = Debug|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.ActiveCfg = Release|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.Build.0 = Release|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.ActiveCfg = Release|Any CPU
+                {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
diff --git a/appveyor.cmd b/appveyor.cmd
index 93dc905f..5545cb60 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -2,6 +2,9 @@
 @pushd %~dp0
 @set _P=%~dp0build\Release\publish
 
+dotnet build -c Release src\test\WixToolsetTest.BuildTasks
+dotnet build -c Release src\test\WixToolsetTest.CoreIntegration
+
 dotnet publish -c Release -o %_P% -r win-x86 src\wix
 dotnet publish -c Release -o %_P% -r win-x86 src\WixToolset.BuildTasks
 
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
index da9f3a38..9859c05a 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
@@ -1,13 +1,13 @@
 // 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.CoreIntegrationFixture
+namespace WixToolsetTest.CoreIntegration
 {
     using System.IO;
     using System.Linq;
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
-    using WixToolsetTest.CoreIntegrationFixture.Utility;
+    using WixToolsetTest.CoreIntegration.Utility;
     using Xunit;
 
     public class ProgramFixture
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
index 9c529668..9c529668 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/PackageComponents.wxs
index e26c4509..e26c4509 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/data/test.txt
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/data/test.txt
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.en-us.wxl
index c74e86a7..c74e86a7 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.en-us.wxl
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.en-us.wxl
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wixproj b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
index 597d4318..597d4318 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wixproj
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
index 260339ba..260339ba 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/data/test.txt
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/data/test.txt
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
index cdc323ec..cdc323ec 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/PackageComponents.wxs
index e26c4509..e26c4509 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SingleFile/data/test.txt
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/data/test.txt
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/Utility/DisposableFileSystem.cs b/src/test/WixToolsetTest.CoreIntegration/Utility/DisposableFileSystem.cs
index 01c0b9fe..795d344a 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/Utility/DisposableFileSystem.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/Utility/DisposableFileSystem.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.CoreIntegrationFixture.Utility
+namespace WixToolsetTest.CoreIntegration.Utility
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/Utility/Pushd.cs b/src/test/WixToolsetTest.CoreIntegration/Utility/Pushd.cs
index 8917e02c..efd733a7 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/Utility/Pushd.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/Utility/Pushd.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.CoreIntegrationFixture.Utility
+namespace WixToolsetTest.CoreIntegration.Utility
 {
     using System;
     using System.IO;
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/Utility/TestData.cs b/src/test/WixToolsetTest.CoreIntegration/Utility/TestData.cs
index 90d56799..e3b21183 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/Utility/TestData.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/Utility/TestData.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.CoreIntegrationFixture.Utility
+namespace WixToolsetTest.CoreIntegration.Utility
 {
     using System;
     using System.IO;
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index f9042cda..f9042cda 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
+++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj