Remove "Fixture" from the test assembly name
Rob Mensching committed
Nov 29, 2017 at 22:11 UTC
b387913d0e76aa7863f8766868cd2fb3b3fffcde
19 files changed
+37
-6
WixToolset.Core.sln
+29
-1
@@ -1,6 +1,6 @@
1
Microsoft Visual Studio Solution File, Format Version 12.00
2
# Visual Studio 15
3
-VisualStudioVersion = 15.0.26730.16
3
+VisualStudioVersion = 15.0.27004.2009
4
MinimumVisualStudioVersion = 15.0.26124.0
5
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core", "src\WixToolset.Core\WixToolset.Core.csproj", "{0B524850-5B9A-472B-85CC-D25920A1DFE1}"
6
EndProject
@@ -12,6 +12,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.WindowsInst
12
EndProject
13
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Burn", "src\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj", "{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}"
14
EndProject
15
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BuildTasks", "src\test\WixToolsetTest.BuildTasks\WixToolsetTest.BuildTasks.csproj", "{044F32F1-64E4-410A-9AA8-DCFCCDD363BB}"
16
+EndProject
17
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.CoreIntegration", "src\test\WixToolsetTest.CoreIntegration\WixToolsetTest.CoreIntegration.csproj", "{E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}"
18
+EndProject
19
Global
20
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21
Debug|Any CPU = Debug|Any CPU
@@ -82,6 +86,30 @@ Global
86
{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x64.Build.0 = Release|Any CPU
87
{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.ActiveCfg = Release|Any CPU
88
{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.Build.0 = Release|Any CPU
89
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
91
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x64.ActiveCfg = Debug|Any CPU
92
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x64.Build.0 = Debug|Any CPU
93
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x86.ActiveCfg = Debug|Any CPU
94
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Debug|x86.Build.0 = Debug|Any CPU
95
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
96
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|Any CPU.Build.0 = Release|Any CPU
97
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x64.ActiveCfg = Release|Any CPU
98
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x64.Build.0 = Release|Any CPU
99
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x86.ActiveCfg = Release|Any CPU
100
+ {044F32F1-64E4-410A-9AA8-DCFCCDD363BB}.Release|x86.Build.0 = Release|Any CPU
101
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.Build.0 = Debug|Any CPU
103
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.ActiveCfg = Debug|Any CPU
104
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.Build.0 = Debug|Any CPU
105
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.ActiveCfg = Debug|Any CPU
106
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.Build.0 = Debug|Any CPU
107
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.ActiveCfg = Release|Any CPU
108
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.Build.0 = Release|Any CPU
109
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.ActiveCfg = Release|Any CPU
110
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.Build.0 = Release|Any CPU
111
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.ActiveCfg = Release|Any CPU
112
+ {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.Build.0 = Release|Any CPU
113
EndGlobalSection
114
GlobalSection(SolutionProperties) = preSolution
115
HideSolutionNode = FALSE
appveyor.cmd
+3
@@ -2,6 +2,9 @@
2
@pushd %~dp0
3
@set _P=%~dp0build\Release\publish
4
5
+dotnet build -c Release src\test\WixToolsetTest.BuildTasks
6
+dotnet build -c Release src\test\WixToolsetTest.CoreIntegration
7
+
8
dotnet publish -c Release -o %_P% -r win-x86 src\wix
9
dotnet publish -c Release -o %_P% -r win-x86 src\WixToolset.BuildTasks
10
src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
renamed
+2
-2
@@ -1,13 +1,13 @@
1
// 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.
2
3
-namespace WixToolsetTest.CoreIntegrationFixture
3
+namespace WixToolsetTest.CoreIntegration
4
{
5
using System.IO;
6
using System.Linq;
7
using WixToolset.Core;
8
using WixToolset.Data;
9
using WixToolset.Data.Tuples;
10
- using WixToolsetTest.CoreIntegrationFixture.Utility;
10
+ using WixToolsetTest.CoreIntegration.Utility;
11
using Xunit;
12
13
public class ProgramFixture
src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.en-us.wxl
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/Package.wxs
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/PackageComponents.wxs
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/InstanceTransform/data/test.txt
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.en-us.wxl
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wxs
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/data/test.txt
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.en-us.wxl
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/PackageComponents.wxs
renamed
src/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/data/test.txt
renamed
src/test/WixToolsetTest.CoreIntegration/Utility/DisposableFileSystem.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// 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.
2
3
-namespace WixToolsetTest.CoreIntegrationFixture.Utility
3
+namespace WixToolsetTest.CoreIntegration.Utility
4
{
5
using System;
6
using System.Collections.Generic;
src/test/WixToolsetTest.CoreIntegration/Utility/Pushd.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// 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.
2
3
-namespace WixToolsetTest.CoreIntegrationFixture.Utility
3
+namespace WixToolsetTest.CoreIntegration.Utility
4
{
5
using System;
6
using System.IO;
src/test/WixToolsetTest.CoreIntegration/Utility/TestData.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// 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.
2
3
-namespace WixToolsetTest.CoreIntegrationFixture.Utility
3
+namespace WixToolsetTest.CoreIntegration.Utility
4
{
5
using System;
6
using System.IO;