c843b47d · joebigelow/wix-1 · siGit Code & Deploy

nuget.config

+1 -1

@@ -15,7 +15,7 @@

15 </packageSource>

16 <packageSource key="build">

17 <package pattern="WixToolset.*" />

18 - <package pattern="WixBuildTools.*" />

18 + <package pattern="WixInternal.*" />

19 </packageSource>

20 </packageSourceMapping>

21 </configuration>

src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp

+2 -2

@@ -4,8 +4,8 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

8 -using namespace WixBuildTools::TestSupport::XunitExtensions;

7 +using namespace WixInternal::TestSupport;

8 +using namespace WixInternal::TestSupport::XunitExtensions;

9

10 namespace BalUtilTests

11 {

src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj

+2 -2

@@ -3,7 +3,7 @@

3

4

5 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

6 - <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />

6 + <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.props" />

7

8 <ItemGroup Label="ProjectConfigurations">

9 <ProjectConfiguration Include="Debug|Win32">

@@ -61,5 +61,5 @@

61 </ItemGroup>

62

63 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

64 - <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />

64 + <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.targets" />

65 </Project>

src/api/burn/test/BalUtilUnitTest/BootstrapperApplicationTests.cpp

+2 -2

@@ -4,8 +4,8 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

8 -using namespace WixBuildTools::TestSupport::XunitExtensions;

7 +using namespace WixInternal::TestSupport;

8 +using namespace WixInternal::TestSupport::XunitExtensions;

9

10 namespace BalUtilTests

11 {

src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj

+2 -2

@@ -2,7 +2,7 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />

5 + <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.props" />

6

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|Win32">

@@ -57,5 +57,5 @@

57 </ItemGroup>

58

59 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

60 - <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />

60 + <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.targets" />

61 </Project>

src/api/burn/test/BextUtilUnitTest/BundleExtensionTests.cpp

+2 -2

@@ -4,8 +4,8 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

8 -using namespace WixBuildTools::TestSupport::XunitExtensions;

7 +using namespace WixInternal::TestSupport;

8 +using namespace WixInternal::TestSupport::XunitExtensions;

9

10 namespace BextUtilTests

11 {

src/api/burn/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Mba.Core

5 using System;

6 using System.Collections.Generic;

7 using System.Runtime.InteropServices;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Mba.Core;

10 using Xunit;

11

src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj

+1 -1

@@ -13,6 +13,6 @@

13 </ItemGroup>

14

15 <ItemGroup>

16 - <PackageReference Include="WixBuildTools.TestSupport" />

16 + <PackageReference Include="WixInternal.TestSupport" />

17 </ItemGroup>

18 </Project>

src/api/wix/test/WixToolsetTest.Data/SerializeFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Data

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Data;

10 using WixToolset.Data.Bind;

11 using WixToolset.Data.Symbols;

src/api/wix/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace WixToolsetTest.Data

4 {

5 - using WixBuildTools.TestSupport;

5 + using WixInternal.TestSupport;

6 using WixToolset.Data.WindowsInstaller;

7 using Xunit;

8

src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj

+1 -1

@@ -12,6 +12,6 @@

12 </ItemGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixBuildTools.TestSupport" />

15 + <PackageReference Include="WixInternal.TestSupport" />

16 </ItemGroup>

17 </Project>

src/burn/test/BurnUnitTest/BurnTestException.h

+1 -1

@@ -13,7 +13,7 @@ namespace Test

13 namespace Bootstrapper

14 {

15 using namespace System;

16 - using namespace WixBuildTools::TestSupport;

16 + using namespace WixInternal::TestSupport;

17

18 public ref struct BurnTestException : public SucceededException

19 {

src/burn/test/BurnUnitTest/BurnTestFixture.h

+2 -2

@@ -13,7 +13,7 @@ namespace Test

13 namespace Bootstrapper

14 {

15 using namespace System;

16 - using namespace WixBuildTools::TestSupport;

16 + using namespace WixInternal::TestSupport;

17

18 public ref class BurnTestFixture : IDisposable

19 {

@@ -31,7 +31,7 @@ namespace Bootstrapper

31

32 PlatformInitialize();

33

34 - this->testDirectory = WixBuildTools::TestSupport::TestData::Get();

34 + this->testDirectory = WixInternal::TestSupport::TestData::Get();

35

36 LogInitialize(::GetModuleHandleW(L"BurnUnitTest.dll"));

37

src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj

+2 -2

@@ -2,7 +2,7 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />

5 + <Import Project="..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.props" />

6

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|Win32">

@@ -99,5 +99,5 @@

99 </ItemGroup>

100

101 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

102 - <Import Project="..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />

102 + <Import Project="..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.targets" />

103 </Project>

src/burn/test/BurnUnitTest/RegistrationTest.cpp

+1 -1

@@ -23,7 +23,7 @@ namespace Bootstrapper

23 using namespace System;

24 using namespace System::IO;

25 using namespace Xunit;

26 - using namespace WixBuildTools::TestSupport;

26 + using namespace WixInternal::TestSupport;

27

28 public ref class RegistrationTest : BurnUnitTest, IClassFixture<TestRegistryFixture^>

29 {

src/burn/test/BurnUnitTest/RelatedBundleTest.cpp

+1 -1

@@ -16,7 +16,7 @@ namespace Bootstrapper

16 using namespace System;

17 using namespace System::IO;

18 using namespace Xunit;

19 - using namespace WixBuildTools::TestSupport;

19 + using namespace WixInternal::TestSupport;

20

21 public ref class RelatedBundleTest : BurnUnitTest, IClassFixture<TestRegistryFixture^>

22 {

src/burn/test/BurnUnitTest/TestRegistryFixture.cpp

+1 -1

@@ -165,7 +165,7 @@ LExit:

165 return ls;

166 }

167

168 -namespace WixBuildTools

168 +namespace WixInternal

169 {

170 namespace TestSupport

171 {

src/burn/test/BurnUnitTest/TestRegistryFixture.h

+1 -1

@@ -1,7 +1,7 @@

1 #pragma once

3

4 -namespace WixBuildTools

4 +namespace WixInternal

5 {

6 namespace TestSupport

7 {

src/clean.cmd

+3 -3

@@ -17,8 +17,9 @@ if exist global.json (del global.json)

17 if exist ..\Directory.Packages.props (del ..\Directory.Packages.props)

18 if exist ..\global.json (del ..\global.json)

19

20 -if exist "%_NUGET_CACHE%\wixbuildtools.testsupport" rd /s/q "%_NUGET_CACHE%\wixbuildtools.testsupport"

21 -if exist "%_NUGET_CACHE%\wixtoolset.basebuildtasks.sources" rd /s/q "%_NUGET_CACHE%\wixtoolset.basebuildtasks.sources"

20 +if exist "%_NUGET_CACHE%\wixinternal.basebuildtasks.sources" rd /s/q "%_NUGET_CACHE%\wixinternal.basebuildtasks.sources"

21 +if exist "%_NUGET_CACHE%\wixinternal.testsupport" rd /s/q "%_NUGET_CACHE%\wixinternal.testsupport"

22 +if exist "%_NUGET_CACHE%\wixinternal.core.testpackage" rd /s/q "%_NUGET_CACHE%\wixinternal.core.testpackage"

23 if exist "%_NUGET_CACHE%\wixtoolset.bal.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bal.wixext"

24 if exist "%_NUGET_CACHE%\wixtoolset.balutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.balutil"

25 if exist "%_NUGET_CACHE%\wixtoolset.bextutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.bextutil"

@@ -28,7 +29,6 @@ if exist "%_NUGET_CACHE%\wixtoolset.core" rd /s/q "%_NUGET_CACHE%\wixtoolset.cor

29 if exist "%_NUGET_CACHE%\wixtoolset.core.burn" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.burn"

30 if exist "%_NUGET_CACHE%\wixtoolset.core.extensioncache" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.extensioncache"

31 if exist "%_NUGET_CACHE%\wixtoolset.core.native" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.native"

31 -if exist "%_NUGET_CACHE%\wixtoolset.core.testpackage" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.testpackage"

32 if exist "%_NUGET_CACHE%\wixtoolset.core.windowsinstaller" rd /s/q "%_NUGET_CACHE%\wixtoolset.core.windowsinstaller"

33 if exist "%_NUGET_CACHE%\wixtoolset.data" rd /s/q "%_NUGET_CACHE%\wixtoolset.data"

34 if exist "%_NUGET_CACHE%\wixtoolset.dependency.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.dependency.wixext"

src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs

+2 -2

@@ -6,9 +6,9 @@ namespace WixToolsetTest.Bal

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

9 using WixToolset.Bal;

11 - using WixToolset.Core.TestPackage;

10 + using WixInternal.Core.TestPackage;

11 + using WixInternal.TestSupport;

12 using Xunit;

13

14 public class BalExtensionFixture

src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.Bal

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using Xunit;

11

12 public class InternalUIBAFixture

src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj

+1 -1

@@ -20,6 +20,6 @@

20 </ItemGroup>

21

22 <ItemGroup>

23 - <PackageReference Include="WixToolset.Core.TestPackage" />

23 + <PackageReference Include="WixInternal.Core.TestPackage" />

24 </ItemGroup>

25 </Project>

src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj

+1 -1

@@ -12,7 +12,7 @@

12 </ItemGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixBuildTools.TestSupport" />

15 + <PackageReference Include="WixInternal.TestSupport" />

16 <PackageReference Include="WixToolset.Mba.Core" />

17 </ItemGroup>

18

src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.ManagedHost

4 {

5 using System;

6 - using WixBuildTools.TestSupport;

7 - using WixBuildTools.TestSupport.XunitExtensions;

6 + using WixInternal.TestSupport;

7 + using WixInternal.TestSupport.XunitExtensions;

8 using Xunit;

9

10 public class DncHostFixture

src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace WixToolsetTest.ManagedHost

4 {

5 - using WixBuildTools.TestSupport;

5 + using WixInternal.TestSupport;

6 using Xunit;

7

8 public class MbaHostFixture

src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.ManagedHost

6 using System.Collections.Generic;

7 using System.Diagnostics;

8 using System.IO;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11

12 public class TestEngine

13 {

src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj

+1 -1

@@ -12,6 +12,6 @@

12 </ItemGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Core.TestPackage" />

15 + <PackageReference Include="WixInternal.Core.TestPackage" />

16 </ItemGroup>

17 </Project>

src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.ComPlus

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.ComPlus;

9 using Xunit;

10

src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.Dependency

4 {

5 using System.Linq;

6 using System.Text.RegularExpressions;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Dependency;

10 using Xunit;

11

src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.DifxApp

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.DifxApp;

9 using Xunit;

10

src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj

+1 -1

@@ -19,6 +19,6 @@

19 </ItemGroup>

20

21 <ItemGroup>

22 - <PackageReference Include="WixToolset.Core.TestPackage" />

22 + <PackageReference Include="WixInternal.Core.TestPackage" />

23 </ItemGroup>

24 </Project>

src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.DirectX

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.DirectX;

9 using Xunit;

10

src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj

+1 -1

@@ -19,6 +19,6 @@

19 </ItemGroup>

20

21 <ItemGroup>

22 - <PackageReference Include="WixToolset.Core.TestPackage" />

22 + <PackageReference Include="WixInternal.Core.TestPackage" />

23 </ItemGroup>

24 </Project>

src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.Firewall

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Firewall;

9 using Xunit;

10

src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs

+2 -2

@@ -2,8 +2,8 @@

2

3 namespace WixToolsetTest.Http

4 {

5 - using WixBuildTools.TestSupport;

6 - using WixToolset.Core.TestPackage;

5 + using WixInternal.TestSupport;

6 + using WixInternal.Core.TestPackage;

7 using WixToolset.Http;

8 using Xunit;

9

src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.Iis

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Iis;

9 using Xunit;

10

src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj

+1 -1

@@ -19,6 +19,6 @@

19 </ItemGroup>

20

21 <ItemGroup>

22 - <PackageReference Include="WixToolset.Core.TestPackage" />

22 + <PackageReference Include="WixInternal.Core.TestPackage" />

23 </ItemGroup>

24 </Project>

src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.Msmq

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Msmq;

9 using Xunit;

10

src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj

+1 -1

@@ -19,6 +19,6 @@

19 </ItemGroup>

20

21 <ItemGroup>

22 - <PackageReference Include="WixToolset.Core.TestPackage" />

22 + <PackageReference Include="WixInternal.Core.TestPackage" />

23 </ItemGroup>

24 </Project>

src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.Netfx

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Netfx;

10 using Xunit;

11

src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs

+2 -2

@@ -2,8 +2,8 @@

2

3 namespace WixToolsetTest.PowerShell

4 {

5 - using WixBuildTools.TestSupport;

6 - using WixToolset.Core.TestPackage;

5 + using WixInternal.TestSupport;

6 + using WixInternal.Core.TestPackage;

7 using WixToolset.PowerShell;

8 using Xunit;

9

src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.Sql

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Sql;

9 using Xunit;

10

src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.UI

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data.WindowsInstaller;

11 using WixToolset.UI;

12 using Xunit;

src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.Util

5 using System.IO;

6 using System.Linq;

7 using System.Xml;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Util;

11 using Xunit;

12

src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs

+2 -2

@@ -2,8 +2,8 @@

2

3 namespace WixToolsetTest.VisualStudio

4 {

5 - using WixBuildTools.TestSupport;

6 - using WixToolset.Core.TestPackage;

5 + using WixInternal.TestSupport;

6 + using WixInternal.Core.TestPackage;

7 using WixToolset.VisualStudio;

8 using Xunit;

9

src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj

+1 -1

@@ -16,6 +16,6 @@

16 </ItemGroup>

17

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Core.TestPackage" />

19 + <PackageReference Include="WixInternal.Core.TestPackage" />

20 </ItemGroup>

21 </Project>

src/internal/SetBuildNumber/Directory.Packages.props.pp

+5 -5

@@ -6,9 +6,9 @@

6 <PackageVersion Include="WixToolset.Dtf.Resources" Version="{packageversion}" />

7 <PackageVersion Include="WixToolset.Dtf.WindowsInstaller" Version="{packageversion}" />

8

9 - <PackageVersion Include="WixBuildTools.TestSupport" Version="{packageversion}" />

10 - <PackageVersion Include="WixBuildTools.TestSupport.Native" Version="{packageversion}" />

11 - <PackageVersion Include="WixToolset.BaseBuildTasks.Sources" Version="{packageversion}" />

9 + <PackageVersion Include="WixInternal.TestSupport" Version="{packageversion}" />

10 + <PackageVersion Include="WixInternal.TestSupport.Native" Version="{packageversion}" />

11 + <PackageVersion Include="WixInternal.BaseBuildTasks.Sources" Version="{packageversion}" />

12

13 <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" />

14 <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" />

@@ -28,7 +28,7 @@

28 <PackageVersion Include="WixToolset.Core" Version="{packageversion}" />

29 <PackageVersion Include="WixToolset.Core.Burn" Version="{packageversion}" />

30 <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" />

31 - <PackageVersion Include="WixToolset.Core.TestPackage" Version="{packageversion}" />

31 + <PackageVersion Include="WixInternal.Core.TestPackage" Version="{packageversion}" />

32

33 <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" />

34

@@ -83,7 +83,7 @@

83 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />

84 </ItemGroup>

85

86 -

86 +

87 <ItemGroup>

88 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />

89 <PackageVersion Include="GitInfo" Version="2.2.0" />

src/internal/WixInternal.BaseBuildTasks.Sources/BaseToolsetTask.cs renamed

src/internal/WixInternal.BaseBuildTasks.Sources/WixCommandLineBuilder.cs renamed

src/internal/WixInternal.BaseBuildTasks.Sources/WixInternal.BaseBuildTasks.Sources.csproj renamed

src/internal/WixInternal.TestSupport.Native/AssemblyInfo.cpp renamed

+1 -1

@@ -11,7 +11,7 @@ using namespace System::Runtime::InteropServices;

11 // set of attributes. Change these attribute values to modify the information

12 // associated with an assembly.

13 //

14 -[assembly: AssemblyTitleAttribute("WixBuildTools.TestSupport.Native")];

14 +[assembly: AssemblyTitleAttribute("WixInternal.TestSupport.Native")];

15 [assembly: AssemblyDescriptionAttribute("")];

16 [assembly: AssemblyCultureAttribute("")];

17 [assembly: ComVisible(false)];

src/internal/WixInternal.TestSupport.Native/NativeAssert.h renamed

+1 -1

@@ -2,7 +2,7 @@

3

4

5 -namespace WixBuildTools {

5 +namespace WixInternal {

6 namespace TestSupport {

7

8 using namespace System;

src/internal/WixInternal.TestSupport.Native/WixInternal.TestSupport.Native.vcxproj renamed

+5 -5

@@ -2,7 +2,7 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="build\WixBuildTools.TestSupport.Native.props" />

5 + <Import Project="build\WixInternal.TestSupport.Native.props" />

6

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|Win32">

@@ -26,12 +26,12 @@

26 <PropertyGroup Label="Globals">

27 <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>

28 <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid>

29 - <RootNamespace>WixBuildTools::TestSupport</RootNamespace>

29 + <RootNamespace>WixInternal::TestSupport</RootNamespace>

30 <Keyword>ManagedCProj</Keyword>

31 <ConfigurationType>DynamicLibrary</ConfigurationType>

32 <CharacterSet>Unicode</CharacterSet>

33 <CLRSupport>true</CLRSupport>

34 - <Description>WixBuildTools C++/CLI Test Support</Description>

34 + <Description>WixInternal C++/CLI Test Support</Description>

35 <SignOutput>false</SignOutput>

36 <IsWixTestSupportProject>true</IsWixTestSupportProject>

37 </PropertyGroup>

@@ -63,12 +63,12 @@

63 </ItemGroup>

64

65 <ItemGroup>

66 - <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj">

66 + <ProjectReference Include="..\WixInternal.TestSupport\WixInternal.TestSupport.csproj">

67 <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>

68 </ProjectReference>

69 </ItemGroup>

70

71 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

72 - <Import Project="build\WixBuildTools.TestSupport.Native.targets" />

72 + <Import Project="build\WixInternal.TestSupport.Native.targets" />

73 <Target Name="Pack" DependsOnTargets="Build" />

74 </Project>

src/internal/WixInternal.TestSupport.Native/WixInternal.TestSupport.Native.vcxproj.filters renamed

src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props renamed

src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets renamed

+5 -5

@@ -7,13 +7,13 @@

7 <Reference Include="System.Core" />

8 </ItemGroup>

9

10 -

10 +

11 <ItemGroup Condition="'$(MSBuildProjectName)'!='$(MSBuildThisFileName)'">

12 - <Reference Include="WixBuildTools.TestSupport">

13 - <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.dll</HintPath>

12 + <Reference Include="WixInternal.TestSupport">

13 + <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixInternal.TestSupport.dll</HintPath>

14 </Reference>

15 - <Reference Include="WixBuildTools.TestSupport.Native">

16 - <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.Native.dll</HintPath>

15 + <Reference Include="WixInternal.TestSupport.Native">

16 + <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixInternal.TestSupport.Native.dll</HintPath>

17 </Reference>

18 </ItemGroup>

19

src/internal/WixInternal.TestSupport.Native/packages.config renamed

+1 -1

@@ -3,7 +3,7 @@

3

4 <packages>

5 <!--

6 - Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets

6 + Update build\WixInternal.TestSupport.Native.props and build\WixInternal.TestSupport.Native.targets

7 when any of these versions are updated.

8 -->

9 <package id="GitInfo" version="2.2.0" />

src/internal/WixInternal.TestSupport.Native/precomp.cpp renamed

src/internal/WixInternal.TestSupport.Native/precomp.h renamed

src/internal/WixInternal.TestSupport/Builder.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Generic;

src/internal/WixInternal.TestSupport/DisposableFileSystem.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Generic;

src/internal/WixInternal.TestSupport/DotnetRunner.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Generic;

src/internal/WixInternal.TestSupport/ExternalExecutable.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Concurrent;

src/internal/WixInternal.TestSupport/ExternalExecutableResult.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System.Diagnostics;

6

src/internal/WixInternal.TestSupport/FakeBuildEngine.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System.Collections;

6 using System.Text;

src/internal/WixInternal.TestSupport/MsbuildRunner.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Generic;

src/internal/WixInternal.TestSupport/MsbuildRunnerResult.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using Xunit;

src/internal/WixInternal.TestSupport/MsbuildUtilities.cs renamed

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolsetTest.Sdk

6 using System.Collections.Generic;

7 using System.IO;

8 using System.Linq;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10

11 public enum BuildSystem

12 {

src/internal/WixInternal.TestSupport/Pushd.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.IO;

src/internal/WixInternal.TestSupport/Query.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Generic;

src/internal/WixInternal.TestSupport/RobocopyRunner.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 public class RobocopyRunner : ExternalExecutable

6 {

src/internal/WixInternal.TestSupport/TestData.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.IO;

src/internal/WixInternal.TestSupport/TestDataFolderFileSystem.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6

src/internal/WixInternal.TestSupport/VswhereRunner.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.IO;

src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj renamed

src/internal/WixInternal.TestSupport/XunitExtensions/SkipTestException.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using System;

6

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactAttribute.cs renamed

+2 -2

@@ -1,12 +1,12 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using Xunit;

6 using Xunit.Sdk;

7

8 // https://github.com/xunit/samples.xunit/blob/5dc1d35a63c3394a8678ac466b882576a70f56f6/DynamicSkipExample

9 - [XunitTestCaseDiscoverer("WixBuildTools.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixBuildTools.TestSupport")]

9 + [XunitTestCaseDiscoverer("WixInternal.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixInternal.TestSupport")]

10 public class SkippableFactAttribute : FactAttribute

11 {

12 }

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactDiscoverer.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using System.Collections.Generic;

6 using Xunit.Abstractions;

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactMessageBus.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using System.Linq;

6 using Xunit.Abstractions;

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableFactTestCase.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using System;

6 using System.ComponentModel;

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryAttribute.cs renamed

+2 -2

@@ -1,11 +1,11 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using Xunit;

6 using Xunit.Sdk;

7

8 - [XunitTestCaseDiscoverer("WixBuildTools.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixBuildTools.TestSupport")]

8 + [XunitTestCaseDiscoverer("WixInternal.TestSupport.XunitExtensions.SkippableFactDiscoverer", "WixInternal.TestSupport")]

9 public class SkippableTheoryAttribute : TheoryAttribute

10 {

11 }

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryDiscoverer.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using System.Collections.Generic;

6 using Xunit.Abstractions;

src/internal/WixInternal.TestSupport/XunitExtensions/SkippableTheoryTestCase.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport.XunitExtensions

3 +namespace WixInternal.TestSupport.XunitExtensions

4 {

5 using System;

6 using System.ComponentModel;

src/internal/WixInternal.TestSupport/XunitExtensions/SpecificReturnCodeException.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using Xunit.Sdk;

src/internal/WixInternal.TestSupport/XunitExtensions/SucceededException.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using Xunit.Sdk;

src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs renamed

+4 -4

@@ -1,13 +1,13 @@

2

3 -namespace WixBuildTools.TestSupport

3 +namespace WixInternal.TestSupport

4 {

5 using System;

6 using System.Collections.Generic;

7 using System.Linq;

8 using System.Text;

9 using System.Xml.Linq;

10 - using WixBuildTools.TestSupport.XunitExtensions;

10 + using WixInternal.TestSupport.XunitExtensions;

11 using Xunit;

12 using Xunit.Sdk;

13

@@ -46,8 +46,8 @@ namespace WixBuildTools.TestSupport

46

47 /// <summary>

48 /// Dynamically skips the test.

49 - /// Requires that the test was marked with a fact attribute derived from <see cref="WixBuildTools.TestSupport.XunitExtensions.SkippableFactAttribute" />

50 - /// or <see cref="WixBuildTools.TestSupport.XunitExtensions.SkippableTheoryAttribute" />

49 + /// Requires that the test was marked with a fact attribute derived from <see cref="WixInternal.TestSupport.XunitExtensions.SkippableFactAttribute" />

50 + /// or <see cref="WixInternal.TestSupport.XunitExtensions.SkippableTheoryAttribute" />

51 /// </summary>

52 public static void Skip(string message)

53 {

src/internal/internal.cmd

+6 -6

@@ -31,12 +31,12 @@ msbuild internal_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\inte

31

32 :clean

33 @rd /s/q "..\..\build\internal" 2> nul

34 -@del "..\..\build\artifacts\WixBuildTools.TestSupport.*.nupkg" 2> nul

35 -@del "..\..\build\artifacts\WixBuildTools.TestSupport.Native.*.nupkg" 2> nul

36 -@del "..\..\build\artifacts\WixToolset.BaseBuildTasks.Sources.*.nupkg" 2> nul

37 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport" 2> nul

38 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixbuildtools.testsupport.native" 2> nul

39 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.basebuildtasks.sources" 2> nul

34 +@del "..\..\build\artifacts\WixInternal.TestSupport.*.nupkg" 2> nul

35 +@del "..\..\build\artifacts\WixInternal.TestSupport.Native.*.nupkg" 2> nul

36 +@del "..\..\build\artifacts\WixInternal.BaseBuildTasks.Sources.*.nupkg" 2> nul

37 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.testsupport" 2> nul

38 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.testsupport.native" 2> nul

39 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.basebuildtasks.sources" 2> nul

40 @exit /b

41

42 :end

src/internal/internal.sln

+3 -3

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00

3 # Visual Studio Version 17

4 VisualStudioVersion = 17.3.32929.385

5 MinimumVisualStudioVersion = 10.0.40219.1

6 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}"

6 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.TestSupport", "WixInternal.TestSupport\WixInternal.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}"

7 EndProject

8 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"

8 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixInternal.TestSupport.Native", "WixInternal.TestSupport.Native\WixInternal.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"

9 EndProject

10 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BaseBuildTasks.Sources", "WixToolset.BaseBuildTasks.Sources\WixToolset.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}"

10 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.BaseBuildTasks.Sources", "WixInternal.BaseBuildTasks.Sources\WixInternal.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}"

11 EndProject

12 Global

13 GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/internal/internal_t.proj

+4 -4

@@ -1,8 +1,8 @@

1 <Project Sdk="Microsoft.Build.Traversal">

2 <ItemGroup>

3 - <ProjectReference Include="WixToolset.BaseBuildTasks.Sources\WixToolset.BaseBuildTasks.Sources.csproj" Targets="Pack" />

4 - <ProjectReference Include="WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" Targets="Pack" />

5 - <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x86" />

6 - <ProjectReference Include="WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj" Properties="Platform=x64" />

3 + <ProjectReference Include="WixInternal.BaseBuildTasks.Sources\WixInternal.BaseBuildTasks.Sources.csproj" Targets="Pack" />

4 + <ProjectReference Include="WixInternal.TestSupport\WixInternal.TestSupport.csproj" Targets="Pack" />

5 + <ProjectReference Include="WixInternal.TestSupport.Native\WixInternal.TestSupport.Native.vcxproj" Properties="Platform=x86" />

6 + <ProjectReference Include="WixInternal.TestSupport.Native\WixInternal.TestSupport.Native.vcxproj" Properties="Platform=x64" />

7 </ItemGroup>

8 </Project>

src/libs/dutil/test/DUtilUnitTest/AppUtilTests.cpp

+1 -1

@@ -6,7 +6,7 @@ namespace DutilTests

6 {

7 using namespace System;

8 using namespace Xunit;

9 - using namespace WixBuildTools::TestSupport;

9 + using namespace WixInternal::TestSupport;

10

11 public ref class AppUtil

12 {

src/libs/dutil/test/DUtilUnitTest/ApupUtilTests.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp

+2 -2

@@ -4,8 +4,8 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

8 -using namespace WixBuildTools::TestSupport::XunitExtensions;

7 +using namespace WixInternal::TestSupport;

8 +using namespace WixInternal::TestSupport::XunitExtensions;

9

10 namespace DutilTests

11 {

src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj

+2 -2

@@ -2,7 +2,7 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" />

5 + <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.props" />

6

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|Win32">

@@ -94,5 +94,5 @@

94 </ItemGroup>

95

96 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

97 - <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />

97 + <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.targets" />

98 </Project>

src/libs/dutil/test/DUtilUnitTest/DictUtilTest.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 const DWORD numIterations = 100000;

10

src/libs/dutil/test/DUtilUnitTest/DirUtilTests.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp

+2 -2

@@ -5,8 +5,8 @@

5 using namespace System;

6 using namespace System::Collections;

7 using namespace Xunit;

8 -using namespace WixBuildTools::TestSupport;

9 -using namespace WixBuildTools::TestSupport::XunitExtensions;

8 +using namespace WixInternal::TestSupport;

9 +using namespace WixInternal::TestSupport::XunitExtensions;

10

11 namespace DutilTests

12 {

src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/GuidUtilTest.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/IniUtilTest.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 typedef HRESULT (__clrcall *IniFormatParameters)(

10 INI_HANDLE

src/libs/dutil/test/DUtilUnitTest/LocUtilTests.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/MemUtilTest.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp

+1 -1

@@ -7,7 +7,7 @@ using namespace System;

7 using namespace System::Collections::Generic;

8 using namespace System::Runtime::InteropServices;

9 using namespace Xunit;

10 -using namespace WixBuildTools::TestSupport;

10 +using namespace WixInternal::TestSupport;

11

12 namespace DutilTests

13 {

src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp

+1 -1

@@ -5,7 +5,7 @@

5 using namespace System;

6 using namespace System::IO;

7 using namespace Xunit;

8 -using namespace WixBuildTools::TestSupport;

8 +using namespace WixInternal::TestSupport;

9

10 // from PathCch.h

11 #ifndef PATHCCH_ALLOW_LONG_PATHS

src/libs/dutil/test/DUtilUnitTest/ProcUtilTest.cpp

+2 -2

@@ -5,8 +5,8 @@

5 using namespace System;

6 using namespace System::Security::Principal;

7 using namespace Xunit;

8 -using namespace WixBuildTools::TestSupport;

9 -using namespace WixBuildTools::TestSupport::XunitExtensions;

8 +using namespace WixInternal::TestSupport;

9 +using namespace WixInternal::TestSupport::XunitExtensions;

10

11 namespace DutilTests

12 {

src/libs/dutil/test/DUtilUnitTest/RegUtilTest.cpp

+1 -1

@@ -6,7 +6,7 @@ using namespace System;

6 using namespace System::Collections::Generic;

7 using namespace System::Runtime::InteropServices;

8 using namespace Xunit;

9 -using namespace WixBuildTools::TestSupport;

9 +using namespace WixInternal::TestSupport;

10

11 LPCWSTR wzBaseRegKey = L"Software\\RegUtilTest\\";

12 LPWSTR rgwzMultiValue[2] = { L"First", L"Second" };

src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp

+1 -1

@@ -4,7 +4,7 @@

4

5 using namespace System;

6 using namespace Xunit;

7 -using namespace WixBuildTools::TestSupport;

7 +using namespace WixInternal::TestSupport;

8

9 namespace DutilTests

10 {

src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj

+1 -1

@@ -12,6 +12,6 @@

12 </ItemGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixBuildTools.TestSupport" />

15 + <PackageReference Include="WixInternal.TestSupport" />

16 </ItemGroup>

17 </Project>

src/test/burn/WixTestTools/BundleVerifier.cs

+1 -1

@@ -7,7 +7,7 @@ namespace WixTestTools

7 using System.Linq;

8 using System.Text;

9 using Microsoft.Win32;

10 - using WixBuildTools.TestSupport;

10 + using WixInternal.TestSupport;

11 using WixToolset.Data;

12 using WixToolset.Data.Symbols;

13 using Xunit;

src/test/burn/WixTestTools/MSIExec.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixTestTools

5 using System;

6 using System.IO;

7 using System.Text;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9

10 public class MSIExec : TestTool

11 {

src/test/burn/WixTestTools/RuntimeFactAttribute.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixTestTools

4 {

5 using System;

6 using System.Security.Principal;

7 - using WixBuildTools.TestSupport.XunitExtensions;

7 + using WixInternal.TestSupport.XunitExtensions;

8

9 public class RuntimeFactAttribute : SkippableFactAttribute

10 {

src/test/burn/WixTestTools/TestTool.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixTestTools

6 using System.Collections.Generic;

7 using System.Text;

8 using System.Text.RegularExpressions;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using Xunit;

11

12 public class TestTool : ExternalExecutable

src/test/burn/WixTestTools/WixTestContext.cs

+1 -1

@@ -7,7 +7,7 @@ namespace WixTestTools

7 using System.Linq;

8 using System.Reflection;

9 using Microsoft.Win32;

10 - using WixBuildTools.TestSupport;

10 + using WixInternal.TestSupport;

11 using Xunit.Abstractions;

12

13 public class WixTestContext

src/test/burn/WixTestTools/WixTestTools.csproj

+1 -1

@@ -13,7 +13,7 @@

13 <PackageReference Include="System.DirectoryServices" />

14 <PackageReference Include="System.DirectoryServices.AccountManagement" />

15 <PackageReference Include="System.Security.Principal.Windows" />

16 - <PackageReference Include="WixBuildTools.TestSupport" />

16 + <PackageReference Include="WixInternal.TestSupport" />

17 <PackageReference Include="WixToolset.Data" />

18 <PackageReference Include="WixToolset.Mba.Core" />

19 </ItemGroup>

src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E

4 {

5 using System;

6 using System.IO;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixTestTools;

9 using Xunit;

10 using Xunit.Abstractions;

src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolsetTest.BurnE2E

6 using System.Collections.Generic;

7 using System.IO;

8 using Microsoft.Win32;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using WixTestTools;

11 using WixToolset.Mba.Core;

12 using Xunit;

src/test/burn/WixToolsetTest.BurnE2E/LayoutTests.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E

4 {

5 using System.Collections.Generic;

6 using System.IO;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixTestTools;

9 using Xunit;

10 using Xunit.Abstractions;

src/test/burn/WixToolsetTest.BurnE2E/LongPathTests.cs

+1 -1

@@ -7,7 +7,7 @@ namespace WixToolsetTest.BurnE2E

7 using System.IO;

8 using System.Runtime.InteropServices;

9 using Microsoft.Win32;

10 - using WixBuildTools.TestSupport;

10 + using WixInternal.TestSupport;

11 using WixTestTools;

12 using WixToolset.Mba.Core;

13 using Xunit;

src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestExeTool.cs

+1 -1

@@ -3,7 +3,7 @@

3 namespace WixTestTools

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

6 + using WixInternal.TestSupport;

7

8 public class TestExeTool : TestTool

9 {

src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E

4 {

5 using System.Collections.Generic;

6 using System.IO;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixTestTools;

9 using WixToolset.Mba.Core;

10 using Xunit;

src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj

+1 -1

@@ -20,7 +20,7 @@

20 <PackageReference Include="Microsoft.AspNetCore.Owin" />

21 <PackageReference Include="Microsoft.Win32.Registry" />

22 <PackageReference Include="System.Security.Principal.Windows" />

23 - <PackageReference Include="WixBuildTools.TestSupport" />

23 + <PackageReference Include="WixInternal.TestSupport" />

24 <PackageReference Include="WixToolset.Data" />

25 <PackageReference Include="WixToolset.Mba.Core" />

26 </ItemGroup>

src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj

+1 -1

@@ -19,7 +19,7 @@

19 <ItemGroup>

20 <PackageReference Include="Microsoft.Win32.Registry" />

21 <PackageReference Include="System.Security.Principal.Windows" />

22 - <PackageReference Include="WixBuildTools.TestSupport" />

22 + <PackageReference Include="WixInternal.TestSupport" />

23 <PackageReference Include="WixToolset.Data" />

24 </ItemGroup>

25 </Project>

src/test/wix/WixE2E/WixE2E.csproj

+1 -1

@@ -12,6 +12,6 @@

12 </ItemGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixBuildTools.TestSupport" />

15 + <PackageReference Include="WixInternal.TestSupport" />

16 </ItemGroup>

17 </Project>

src/test/wix/WixE2E/WixE2EFixture.cs

+1 -1

@@ -8,7 +8,7 @@ namespace WixE2E

8 using System.Security.Cryptography;

9 using System.Text;

10 using System.Threading;

11 - using WixBuildTools.TestSupport;

11 + using WixInternal.TestSupport;

12 using Xunit;

13

14 public class WixE2EFixture

src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj

+1 -1

@@ -12,6 +12,6 @@

12

13 <ItemGroup>

14 <PackageReference Include="Microsoft.Build.Tasks.Core" />

15 - <PackageReference Include="WixToolset.BaseBuildTasks.Sources" />

15 + <PackageReference Include="WixInternal.BaseBuildTasks.Sources" />

16 </ItemGroup>

17 </Project>

src/tools/test/WixToolsetTest.Heat/HeatFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Heat

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using Xunit;

9

10 public class HeatFixture

src/tools/test/WixToolsetTest.Heat/HeatRunner.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Heat

5 using System.Collections.Generic;

6 using System.Threading.Tasks;

7 using WixToolset.Core;

8 - using WixToolset.Core.TestPackage;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using WixToolset.Extensibility.Services;

11 using WixToolset.Tools.Heat;

src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj

+1 -1

@@ -17,6 +17,6 @@

17 </ItemGroup>

18

19 <ItemGroup>

20 - <PackageReference Include="WixToolset.Core.TestPackage" />

20 + <PackageReference Include="WixInternal.Core.TestPackage" />

21 </ItemGroup>

22 </Project>

src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.Sdk

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using WixToolset.Data.Symbols;

12 using Xunit;

src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj

+2 -2

@@ -14,7 +14,7 @@

14 </ItemGroup>

15

16 <ItemGroup>

17 - <PackageReference Include="WixBuildTools.TestSupport" />

18 - <PackageReference Include="WixToolset.Core.TestPackage" />

17 + <PackageReference Include="WixInternal.TestSupport" />

18 + <PackageReference Include="WixInternal.Core.TestPackage" />

19 </ItemGroup>

20 </Project>

src/wix/WixInternal.Core.TestPackage/BundleExtractor.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixToolset.Core.TestPackage

3 +namespace WixInternal.Core.TestPackage

4 {

5 using System;

6 using System.Collections.Generic;

src/wix/WixInternal.Core.TestPackage/ExtractBAContainerResult.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixToolset.Core.TestPackage

3 +namespace WixInternal.Core.TestPackage

4 {

5 using System.Collections.Generic;

6 using System.IO;

src/wix/WixInternal.Core.TestPackage/TestMessageListener.cs renamed

+7 -5

@@ -1,10 +1,12 @@

1 -using System.Collections.Generic;

2 -using WixToolset.Data;

3 -using WixToolset.Extensibility;

4 -using WixToolset.Extensibility.Services;

2

6 -namespace WixToolset.Core.TestPackage

3 +namespace WixInternal.Core.TestPackage

4 {

5 + using System.Collections.Generic;

6 + using WixToolset.Data;

7 + using WixToolset.Extensibility;

8 + using WixToolset.Extensibility.Services;

9 +

10 /// <summary>

11 /// An <see cref="IMessageListener"/> that simply stores all the messages.

12 /// </summary>

src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj renamed

+1 -1

@@ -27,7 +27,7 @@

27 </ItemGroup>

28

29 <ItemGroup>

30 - <PackageReference Include="WixBuildTools.TestSupport" />

30 + <PackageReference Include="WixInternal.TestSupport" />

31 </ItemGroup>

32

33 <ItemGroup>

src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.v3.ncrunchproject renamed

src/wix/WixInternal.Core.TestPackage/WixRunner.cs renamed

+2 -2

@@ -1,11 +1,11 @@

2

3 -namespace WixToolset.Core.TestPackage

3 +namespace WixInternal.Core.TestPackage

4 {

5 - using System;

5 using System.Collections.Generic;

6 using System.Threading;

7 using System.Threading.Tasks;

8 + using WixToolset.Core;

9 using WixToolset.Core.Burn;

10 using WixToolset.Core.ExtensionCache;

11 using WixToolset.Core.WindowsInstaller;

src/wix/WixInternal.Core.TestPackage/WixRunnerResult.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixToolset.Core.TestPackage

3 +namespace WixInternal.Core.TestPackage

4 {

5 using System;

6 using System.Collections.Generic;

src/wix/WixInternal.Core.TestPackage/XmlNodeExtensions.cs renamed

+1 -1

@@ -1,6 +1,6 @@

2

3 -namespace WixToolset.Core.TestPackage

3 +namespace WixInternal.Core.TestPackage

4 {

5 using System.Collections.Generic;

6 using System.IO;

src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj

+1 -1

@@ -13,7 +13,7 @@

13

14 <ItemGroup>

15 <PackageReference Include="Microsoft.Build.Tasks.Core" />

16 - <PackageReference Include="WixToolset.BaseBuildTasks.Sources" />

16 + <PackageReference Include="WixInternal.BaseBuildTasks.Sources" />

17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />

18 </ItemGroup>

19 </Project>

src/wix/pack_t.proj

+1 -1

@@ -7,7 +7,7 @@

7 <ProjectReference Include="WixToolset.Core\WixToolset.Core.csproj" Properties="NoBuild=true" Targets="Pack" />

8 <ProjectReference Include="WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" Properties="NoBuild=true" Targets="Pack" />

9 <ProjectReference Include="WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj" Properties="NoBuild=true" Targets="Pack" />

10 - <ProjectReference Include="WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" Properties="NoBuild=true" Targets="Pack" />

10 + <ProjectReference Include="WixInternal.Core.TestPackage\WixInternal.Core.TestPackage.csproj" Properties="NoBuild=true" Targets="Pack" />

11 <ProjectReference Include="WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" Properties="NoBuild=true" Targets="Pack" />

12

13 <ProjectReference Include="WixToolset.Converters\WixToolset.Converters.csproj" Properties="NoBuild=true" Targets="Pack" />

src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj

+1 -1

@@ -11,7 +11,7 @@

11 </PropertyGroup>

12

13 <ItemGroup>

14 - <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />

14 + <ProjectReference Include="..\..\WixInternal.Core.TestPackage\WixInternal.Core.TestPackage.csproj" />

15 </ItemGroup>

16

17 <ItemGroup>

src/wix/test/CompileCoreTestExtensionWixlib/Program.cs

+1 -1

@@ -1,7 +1,7 @@

2

3 using System.Collections.Generic;

4 -using WixToolset.Core.TestPackage;

4 +using WixInternal.Core.TestPackage;

5

6 namespace CompileCoreTestExtensionWixlib

7 {

src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs

+1 -1

@@ -7,7 +7,7 @@ namespace WixToolsetTest.BuildTasks

7 using System.Linq;

8 using System.Runtime.InteropServices;

9 using Microsoft.Build.Utilities;

10 - using WixBuildTools.TestSupport;

10 + using WixInternal.TestSupport;

11 using WixToolset.BuildTasks;

12 using WixToolset.Data;

13 using WixToolset.Data.Symbols;

src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj

+1 -1

@@ -22,6 +22,6 @@

22 <ItemGroup>

23 <PackageReference Include="Microsoft.Build.Tasks.Core" />

24 <PackageReference Include="WixToolset.Data" />

25 - <PackageReference Include="WixBuildTools.TestSupport" />

25 + <PackageReference Include="WixInternal.TestSupport" />

26 </ItemGroup>

27 </Project>

src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolsetTest.Converters.Symbolizer

6 using System.Collections.Generic;

7 using System.IO;

8 using System.Linq;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using Wix3 = Microsoft.Tools.WindowsInstallerXml;

11 using WixToolset.Converters.Symbolizer;

12 using WixToolset.Data;

src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj

+1 -1

@@ -17,7 +17,7 @@

17

18 <ItemGroup>

19 <PackageReference Include="WixToolset.Data" />

20 - <PackageReference Include="WixBuildTools.TestSupport" />

20 + <PackageReference Include="WixInternal.TestSupport" />

21 </ItemGroup>

22

23 <ItemGroup>

src/wix/test/WixToolsetTest.Converters/BitnessFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/BootstrapperApplicationFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/BundleCacheFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolsetTest.Converters

6 using System.IO;

7 using System.Linq;

8 using System.Xml.Linq;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using WixToolset.Converters;

11 using WixToolsetTest.Converters.Mocks;

12 using Xunit;

src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs

+2 -2

@@ -5,10 +5,10 @@ namespace WixToolsetTest.Converters

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Converters;

10 using WixToolset.Core;

11 - using WixToolset.Core.TestPackage;

11 + using WixInternal.Core.TestPackage;

12 using WixToolsetTest.Converters.Mocks;

13 using Xunit;

14

src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Converters

5 using System;

6 using System.IO;

7 using System.Xml.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Converters;

10 using WixToolsetTest.Converters.Mocks;

11 using Xunit;

src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/DependencyFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/DirectXExtensionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/DirectoryFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/ExePackageFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Converters

5 using System;

6 using System.Linq;

7 using System.Xml.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Converters;

10 using WixToolsetTest.Converters.Mocks;

11 using Xunit;

src/wix/test/WixToolsetTest.Converters/FeatureFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/IncludeFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/LocalizationFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/MsuPackageFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Converters

5 using System;

6 using System.Linq;

7 using System.Xml.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Converters;

10 using WixToolsetTest.Converters.Mocks;

11 using Xunit;

src/wix/test/WixToolsetTest.Converters/ProductPackageFixture.cs

+2 -2

@@ -5,9 +5,9 @@ namespace WixToolsetTest.Converters

5 using System;

6 using System.IO;

7 using System.Xml.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Converters;

10 - using WixToolset.Core.TestPackage;

10 + using WixInternal.Core.TestPackage;

11 using WixToolsetTest.Converters.Mocks;

12 using Xunit;

13

src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/RegistryFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/RemotePayloadFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/SequenceFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/TagFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/VSExtensionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/VariableFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/Wix4ConversionFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Converters

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Converters;

9 using WixToolsetTest.Converters.Mocks;

10 using Xunit;

src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj

+2 -2

@@ -19,10 +19,10 @@

19 <ProjectReference Include="..\..\WixToolset.Core\WixToolset.Core.csproj" />

20 <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />

21 <ProjectReference Include="..\..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />

22 - <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />

22 + <ProjectReference Include="..\..\WixInternal.Core.TestPackage\WixInternal.Core.TestPackage.csproj" />

23 </ItemGroup>

24

25 <ItemGroup>

26 - <PackageReference Include="WixBuildTools.TestSupport" />

26 + <PackageReference Include="WixInternal.TestSupport" />

27 </ItemGroup>

28 </Project>

src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs

+2 -2

@@ -5,7 +5,7 @@ namespace WixToolsetTest.CoreNative

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Core.Native;

10 using WixToolset.Data;

11 using Xunit;

@@ -119,7 +119,7 @@ namespace WixToolsetTest.CoreNative

119 var cabFileInfo = enumerated[i];

120 var fileInfo = new FileInfo(files[i]);

121

122 - WixBuildTools.TestSupport.WixAssert.StringEqual(cabFileInfo.FileId, fileInfo.Name);

122 + WixInternal.TestSupport.WixAssert.StringEqual(cabFileInfo.FileId, fileInfo.Name);

123 Assert.Equal(cabFileInfo.Size, fileInfo.Length);

124 Assert.True(cabFileInfo.SameAsDateTime(fileInfo.CreationTime));

125 }

src/wix/test/WixToolsetTest.Core.Native/CertificateHashesFixture.cs

+8 -8

@@ -3,7 +3,7 @@

3 namespace WixToolsetTest.CoreNative

4 {

5 using System.Linq;

6 - using WixBuildTools.TestSupport;

6 + using WixInternal.TestSupport;

7 using WixToolset.Core.Native;

8 using Xunit;

9

@@ -17,9 +17,9 @@ namespace WixToolsetTest.CoreNative

17 var hashes = CertificateHashes.Read(new[] { cabFile });

18

19 var hash = hashes.Single();

20 - WixBuildTools.TestSupport.WixAssert.StringEqual(cabFile, hash.Path);

21 - WixBuildTools.TestSupport.WixAssert.StringEqual("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hash.PublicKey);

22 - WixBuildTools.TestSupport.WixAssert.StringEqual("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hash.Thumbprint);

20 + WixInternal.TestSupport.WixAssert.StringEqual(cabFile, hash.Path);

21 + WixInternal.TestSupport.WixAssert.StringEqual("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hash.PublicKey);

22 + WixInternal.TestSupport.WixAssert.StringEqual("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hash.Thumbprint);

23 Assert.Null(hash.Exception);

24 }

25

@@ -31,7 +31,7 @@ namespace WixToolsetTest.CoreNative

31 var hashes = CertificateHashes.Read(new[] { txtFile });

32

33 var hash = hashes.Single();

34 - WixBuildTools.TestSupport.WixAssert.StringEqual(txtFile, hash.Path);

34 + WixInternal.TestSupport.WixAssert.StringEqual(txtFile, hash.Path);

35 Assert.Null(hash.Exception);

36 }

37

@@ -43,9 +43,9 @@ namespace WixToolsetTest.CoreNative

43

44 var hashes = CertificateHashes.Read(new[] { cabFile, txtFile });

45

46 - WixBuildTools.TestSupport.WixAssert.StringEqual(cabFile, hashes[0].Path);

47 - WixBuildTools.TestSupport.WixAssert.StringEqual("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hashes[0].PublicKey);

48 - WixBuildTools.TestSupport.WixAssert.StringEqual("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hashes[0].Thumbprint);

46 + WixInternal.TestSupport.WixAssert.StringEqual(cabFile, hashes[0].Path);

47 + WixInternal.TestSupport.WixAssert.StringEqual("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hashes[0].PublicKey);

48 + WixInternal.TestSupport.WixAssert.StringEqual("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hashes[0].Thumbprint);

49 Assert.Null(hashes[0].Exception);

50

51 Assert.Equal(txtFile, hashes[1].Path);

src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj

+1 -1

@@ -18,6 +18,6 @@

18 </ItemGroup>

19

20 <ItemGroup>

21 - <PackageReference Include="WixBuildTools.TestSupport" />

21 + <PackageReference Include="WixInternal.TestSupport" />

22 </ItemGroup>

23 </Project>

src/wix/test/WixToolsetTest.Core/ParserHelperFixture.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.Core

4 {

5 using System;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Core;

9 using WixToolset.Data;

10 using WixToolset.Extensibility.Services;

src/wix/test/WixToolsetTest.Core/PreprocessorFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Core

5 using System;

6 using System.IO;

7 using System.Xml;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using WixToolset.Core;

10 using WixToolset.Extensibility.Data;

11 using WixToolset.Extensibility.Services;

src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj

+1 -1

@@ -12,6 +12,6 @@

12 </ItemGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixBuildTools.TestSupport" />

15 + <PackageReference Include="WixInternal.TestSupport" />

16 </ItemGroup>

17 </Project>

src/wix/test/WixToolsetTest.CoreIntegration/AdvertisedTypeLibVersionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Data;

9 using Xunit;

10

src/wix/test/WixToolsetTest.CoreIntegration/ApprovedExeFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using Xunit;

9

10 public class ApprovedExeFixture

src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using Xunit;

12

src/wix/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using Xunit;

11

12 public class BindVariablesFixture

src/wix/test/WixToolsetTest.CoreIntegration/BootstrapperApplicationFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using WixToolset.Data.Symbols;

11 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using Xunit;

11

src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs

+2 -2

@@ -9,9 +9,9 @@ namespace WixToolsetTest.CoreIntegration

9 using System.Text;

10 using System.Xml;

11 using Example.Extension;

12 - using WixBuildTools.TestSupport;

12 + using WixInternal.TestSupport;

13 using WixToolset.Core.Burn;

14 - using WixToolset.Core.TestPackage;

14 + using WixInternal.Core.TestPackage;

15 using WixToolset.Data;

16 using WixToolset.Data.Burn;

17 using WixToolset.Data.Symbols;

src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.Collections.Generic;

7 using System.IO;

8 using Example.Extension;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class BundleManifestFixture

src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using WixToolset.Data;

12 using WixToolset.Data.Symbols;

13 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.Collections.Generic;

7 using System.IO;

8 using System.Linq;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class BurnRemotePayloadSubcommandFixture

src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using Xunit;

11

12 public class CabFixture

src/wix/test/WixToolsetTest.CoreIntegration/ClassFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using Xunit;

9

10 public class ClassFixture

src/wix/test/WixToolsetTest.CoreIntegration/CommandLineFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using Xunit;

10

11 public class CommandLineFixture

src/wix/test/WixToolsetTest.CoreIntegration/ComponentFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using Xunit;

12

src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs

+2 -2

@@ -6,9 +6,9 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using WixToolset.Core.Burn.Bundles;

11 - using WixToolset.Core.TestPackage;

11 + using WixInternal.Core.TestPackage;

12 using WixToolset.Data;

13 using WixToolset.Data.WindowsInstaller;

14 using WixToolset.Data.WindowsInstaller.Rows;

src/wix/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using WixToolset.Data.Symbols;

11 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using Xunit;

10

11 public class CustomActionFixture

src/wix/test/WixToolsetTest.CoreIntegration/CustomTableFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Xml.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using Xunit;

10

11 public class CustomTableFixture

src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using Xunit;

9

10 public class DecompileFixture

src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class DependencyExtensionFixture

src/wix/test/WixToolsetTest.CoreIntegration/DirectoryFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using WixToolset.Data.WindowsInstaller;

12 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class ExePackageFixture

src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs

+2 -2

@@ -7,8 +7,8 @@ namespace WixToolsetTest.CoreIntegration

7 using System.Linq;

8 using System.Text.RegularExpressions;

9 using Example.Extension;

10 - using WixBuildTools.TestSupport;

11 - using WixToolset.Core.TestPackage;

10 + using WixInternal.TestSupport;

11 + using WixInternal.Core.TestPackage;

12 using WixToolset.Data;

13 using WixToolset.Data.Symbols;

14 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/FeatureFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using Xunit;

12

src/wix/test/WixToolsetTest.CoreIntegration/LanguageFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using WixToolset.Data.Symbols;

11 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs

+2 -2

@@ -6,9 +6,9 @@ namespace WixToolsetTest.CoreIntegration

6 using System;

7 using System.IO;

8 using System.Linq;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using WixToolset.Core;

11 - using WixToolset.Core.TestPackage;

11 + using WixInternal.Core.TestPackage;

12 using WixToolset.Data;

13 using WixToolset.Data.Symbols;

14 using WixToolset.Extensibility.Data;

src/wix/test/WixToolsetTest.CoreIntegration/MediaFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using Xunit;

11

src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using WixToolset.Data.Symbols;

11 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/MsiCabinetFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using WixToolset.Data.Symbols;

12 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using Example.Extension;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using WixToolset.Data;

12 using WixToolset.Data.Symbols;

13 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/MsiPackageFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System.IO;

6 using System.Linq;

7 using System.Xml;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using Xunit;

11

12 public class MsiPackageFixture

src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using Example.Extension;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class MsiQueryFixture

src/wix/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.Collections.Generic;

6 using System.IO;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using Xunit;

10

11 public class MsiTransactionFixture

src/wix/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using Xunit;

10

11 public class MsuPackageFixture

src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class PackagePayloadFixture

src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs

+2 -2

@@ -14,8 +14,8 @@ namespace WixToolsetTest.CoreIntegration

14 using System.Xml;

15 using System.Xml.Linq;

16 using Example.Extension;

17 - using WixBuildTools.TestSupport;

18 - using WixToolset.Core.TestPackage;

17 + using WixInternal.TestSupport;

18 + using WixInternal.Core.TestPackage;

19 using WixToolset.Data;

20 using WixToolset.Data.Burn;

21 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs

+2 -2

@@ -7,8 +7,8 @@ namespace WixToolsetTest.CoreIntegration

7 using System.IO;

8 using System.Linq;

9 using System.Xml;

10 - using WixBuildTools.TestSupport;

11 - using WixToolset.Core.TestPackage;

10 + using WixInternal.TestSupport;

11 + using WixInternal.Core.TestPackage;

12 using WixToolset.Data;

13 using WixToolset.Data.Symbols;

14 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs

+2 -2

@@ -4,9 +4,9 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Core;

9 - using WixToolset.Core.TestPackage;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using WixToolset.Data.Symbols;

12 using WixToolset.Extensibility.Data;

src/wix/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using Xunit;

11

src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using Xunit;

12

13 public class RollbackBoundaryFixture

src/wix/test/WixToolsetTest.CoreIntegration/ShortcutFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using Xunit;

9

10 public class ShortcutFixture

src/wix/test/WixToolsetTest.CoreIntegration/SigningFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using Xunit;

9

10 public class SigningFixture

src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System.IO;

6 using System.Linq;

7 using System.Xml.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using Xunit;

12

src/wix/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.Collections.Generic;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using Xunit;

9

10 public class TestXmlFixture

src/wix/test/WixToolsetTest.CoreIntegration/TransformFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data.WindowsInstaller;

10 using Xunit;

11

src/wix/test/WixToolsetTest.CoreIntegration/UIFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using Example.Extension;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using WixToolset.Data;

12 using WixToolset.Data.Symbols;

13 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/UnadvertisedTypeLibVersionFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Data;

9 using Xunit;

10

src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using Xunit;

11

src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using WixToolset.Data.Symbols;

12 using WixToolset.Data.WindowsInstaller;

src/wix/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs

+1 -1

@@ -4,7 +4,7 @@

4 namespace WixToolsetTest.CoreIntegration

5 {

6 using System.Collections.Generic;

7 - using WixBuildTools.TestSupport;

7 + using WixInternal.TestSupport;

8 using WixToolset.Core;

9 using WixToolset.Data;

10 using WixToolset.Data.Bind;

src/wix/test/WixToolsetTest.CoreIntegration/VersionFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System.IO;

6 using System.Linq;

7 using System.Xml;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using Xunit;

12

src/wix/test/WixToolsetTest.CoreIntegration/WarningFixture.cs

+2 -2

@@ -3,8 +3,8 @@

3 namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 - using WixBuildTools.TestSupport;

7 - using WixToolset.Core.TestPackage;

6 + using WixInternal.TestSupport;

7 + using WixInternal.Core.TestPackage;

8 using WixToolset.Data;

9 using Xunit;

10

src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj

+2 -2

@@ -16,11 +16,11 @@

16 <ProjectReference Include="..\..\WixToolset.Core\WixToolset.Core.csproj" />

17 <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />

18 <ProjectReference Include="..\..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />

19 - <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />

19 + <ProjectReference Include="..\..\WixInternal.Core.TestPackage\WixInternal.Core.TestPackage.csproj" />

20 <ProjectReference Include="..\Example.Extension\Example.Extension.csproj" />

21 </ItemGroup>

22

23 <ItemGroup>

24 - <PackageReference Include="WixBuildTools.TestSupport" />

24 + <PackageReference Include="WixInternal.TestSupport" />

25 </ItemGroup>

26 </Project>

src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs

+2 -2

@@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreIntegration

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

9 - using WixToolset.Core.TestPackage;

8 + using WixInternal.TestSupport;

9 + using WixInternal.Core.TestPackage;

10 using WixToolset.Data;

11 using WixToolset.Data.Symbols;

12 using Example.Extension;

src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs

+2 -2

@@ -6,8 +6,8 @@ namespace WixToolsetTest.CoreIntegration

6 using System.IO;

7 using System.Linq;

8 using Example.Extension;

9 - using WixBuildTools.TestSupport;

10 - using WixToolset.Core.TestPackage;

9 + using WixInternal.TestSupport;

10 + using WixInternal.Core.TestPackage;

11 using WixToolset.Data;

12 using WixToolset.Data.Symbols;

13 using Xunit;

src/wix/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs

+2 -2

@@ -4,8 +4,8 @@ namespace WixToolsetTest.CoreIntegration

4 {

5 using System.IO;

6 using System.Linq;

7 - using WixBuildTools.TestSupport;

8 - using WixToolset.Core.TestPackage;

7 + using WixInternal.TestSupport;

8 + using WixInternal.Core.TestPackage;

9 using WixToolset.Data;

10 using WixToolset.Data.Symbols;

11 using Xunit;

src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolsetTest.Sdk

6 using System.Collections.Generic;

7 using System.IO;

8 using System.Linq;

9 - using WixBuildTools.TestSupport;

9 + using WixInternal.TestSupport;

10 using Xunit;

11

12 public class MsbuildFixture

src/wix/test/WixToolsetTest.Sdk/MsbuildValidationFixture.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.Sdk

5 using System;

6 using System.IO;

7 using System.Linq;

8 - using WixBuildTools.TestSupport;

8 + using WixInternal.TestSupport;

9 using Xunit;

10

11 // When these tests are run repeatedly, they will expose an issue

src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj

+2 -2

@@ -14,10 +14,10 @@

14 </ItemGroup>

15

16 <ItemGroup>

17 - <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" />

17 + <ProjectReference Include="..\..\WixInternal.Core.TestPackage\WixInternal.Core.TestPackage.csproj" />

18 </ItemGroup>

19

20 <ItemGroup>

21 - <PackageReference Include="WixBuildTools.TestSupport" />

21 + <PackageReference Include="WixInternal.TestSupport" />

22 </ItemGroup>

23 </Project>

src/wix/wix.cmd

+1 -1

@@ -69,7 +69,7 @@ msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_p

69 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.core.burn" 2> nul

70 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.core.native" 2> nul

71 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.core.windowsinstaller" 2> nul

72 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.core.testpackage" 2> nul

72 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixinternal.core.testpackage" 2> nul

73 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.sdk" 2> nul

74 @exit /b

75

src/wix/wix.sln

+1 -1

@@ -24,7 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.Extension", "test\E

24 EndProject

25 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.CoreIntegration", "test\WixToolsetTest.CoreIntegration\WixToolsetTest.CoreIntegration.csproj", "{E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}"

26 EndProject

27 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.TestPackage", "WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj", "{853716DB-C02C-41BD-91BC-79CDC0C17D10}"

27 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.Core.TestPackage", "WixInternal.Core.TestPackage\WixInternal.Core.TestPackage.csproj", "{853716DB-C02C-41BD-91BC-79CDC0C17D10}"

28 EndProject

29 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompileCoreTestExtensionWixlib", "test\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj", "{23FC60D7-B101-42F8-9786-DB7A9CD964A2}"

30 EndProject

Separate WixInternal content from official WixToolset namespace