Create WixTestTools project and reorganize files.
Sean Hall committed
Feb 17, 2021 at 15:45 UTC
badde27bf66fcacef2d625af0bd7590ecdc5804f
23 files changed
+56
-13
BurnE2ETests.sln
+15
-1
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio Version 16
4
VisualStudioVersion = 16.0.29503.13
5
MinimumVisualStudioVersion = 10.0.40219.1
6
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "src\Utilities\TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}"
6
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "src\TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}"
7
+EndProject
8
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "src\WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}"
9
EndProject
10
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "src\WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}"
11
EndProject
@@ -29,6 +31,18 @@ Global
31
{04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x64.Build.0 = Release|Any CPU
32
{04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x86.ActiveCfg = Release|Any CPU
33
{04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x86.Build.0 = Release|Any CPU
34
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
36
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.ActiveCfg = Debug|Any CPU
37
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.Build.0 = Debug|Any CPU
38
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.ActiveCfg = Debug|Any CPU
39
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.Build.0 = Debug|Any CPU
40
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
41
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.Build.0 = Release|Any CPU
42
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.ActiveCfg = Release|Any CPU
43
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.Build.0 = Release|Any CPU
44
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.ActiveCfg = Release|Any CPU
45
+ {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.Build.0 = Release|Any CPU
46
{FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47
{FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU
48
{FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU
src/TestBA/Hresult.cs
renamed
src/TestBA/TestBA.BootstrapperCore.config
renamed
src/TestBA/TestBA.cs
renamed
src/TestBA/TestBA.csproj
renamed
src/TestBA/TestBAFactory.cs
renamed
src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+1
-1
@@ -10,7 +10,7 @@
10
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
11
</ItemGroup>
12
<ItemGroup>
13
- <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
13
+ <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
14
</ItemGroup>
15
<ItemGroup>
16
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" />
src/WixTestTools/BundleInstaller.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.IO;
src/WixTestTools/BundleRegistration.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using Microsoft.Win32;
src/WixTestTools/BundleVerifier.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.IO;
src/WixTestTools/MSIExec.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.IO;
src/WixTestTools/MsiUtilities.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using WixToolset.Dtf.WindowsInstaller;
6
src/WixTestTools/PackageInstaller.cs
renamed
+2
-2
@@ -1,10 +1,10 @@
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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.IO;
7
- using static WixToolsetTest.BurnE2E.MSIExec;
7
+ using static WixTestTools.MSIExec;
8
9
public partial class PackageInstaller : IDisposable
10
{
src/WixTestTools/PackageVerifier.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.IO;
src/WixTestTools/TestTool.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.Collections.Generic;
src/WixTestTools/WixTestBase.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using Xunit.Abstractions;
6
src/WixTestTools/WixTestContext.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.BurnE2E
3
+namespace WixTestTools
4
{
5
using System;
6
using System.IO;
src/WixTestTools/WixTestTools.csproj
new
+21
@@ -0,0 +1,21 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<!-- 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. -->
3
+
4
+<Project Sdk="Microsoft.NET.Sdk">
5
+ <PropertyGroup>
6
+ <TargetFramework>netcoreapp3.1</TargetFramework>
7
+ <PlatformTarget>x64</PlatformTarget>
8
+ </PropertyGroup>
9
+
10
+ <ItemGroup>
11
+ <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
12
+ <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
13
+ <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
14
+ <PackageReference Include="WixToolset.Data" Version="4.0.185" />
15
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.48" />
16
+ </ItemGroup>
17
+
18
+ <ItemGroup>
19
+ <PackageReference Include="xunit" Version="2.4.1" />
20
+ </ItemGroup>
21
+</Project>
src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
+1
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
4
{
5
using System;
6
using System.Collections.Generic;
7
+ using WixTestTools;
8
using Xunit;
9
using Xunit.Abstractions;
10
src/WixToolsetTest.BurnE2E/FailureTests.cs
+1
@@ -2,6 +2,7 @@
2
3
namespace WixToolsetTest.BurnE2E
4
{
5
+ using WixTestTools;
6
using Xunit;
7
using Xunit.Abstractions;
8
src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
+1
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
4
{
5
using System;
6
using System.IO;
7
+ using WixTestTools;
8
using Xunit;
9
using Xunit.Abstractions;
10
src/WixToolsetTest.BurnE2E/TestBAController.cs
+1
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
4
{
5
using System;
6
using Microsoft.Win32;
7
+ using WixTestTools;
8
using WixToolset.Mba.Core;
9
10
public class TestBAController : IDisposable
src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+4
@@ -12,6 +12,10 @@
12
<Content Include="runtests.cmd" CopyToOutputDirectory="PreserveNewest" />
13
</ItemGroup>
14
15
+ <ItemGroup>
16
+ <ProjectReference Include="..\WixTestTools\WixTestTools.csproj" />
17
+ </ItemGroup>
18
+
19
<ItemGroup>
20
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
21
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />