diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-11-08 14:58:05 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-11-08 16:20:25 -0800 |
| commit | c843b47d6233153fa961c6d0e61edf7cedf255bb (patch) | |
| tree | 9eae6badd42d3badb8665b7414b4d44ca48d6ae1 /src/burn | |
| parent | 7e498d6348c26583972ea1cdf7d51dadc8f5b792 (diff) | |
| download | wix-c843b47d6233153fa961c6d0e61edf7cedf255bb.tar.gz wix-c843b47d6233153fa961c6d0e61edf7cedf255bb.tar.bz2 wix-c843b47d6233153fa961c6d0e61edf7cedf255bb.zip | |
Separate WixInternal content from official WixToolset namespace
Diffstat (limited to 'src/burn')
| -rw-r--r-- | src/burn/test/BurnUnitTest/BurnTestException.h | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/BurnTestFixture.h | 4 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 4 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/RegistrationTest.cpp | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/RelatedBundleTest.cpp | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/TestRegistryFixture.cpp | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/TestRegistryFixture.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/burn/test/BurnUnitTest/BurnTestException.h b/src/burn/test/BurnUnitTest/BurnTestException.h index e813f95c..b9467926 100644 --- a/src/burn/test/BurnUnitTest/BurnTestException.h +++ b/src/burn/test/BurnUnitTest/BurnTestException.h | |||
| @@ -13,7 +13,7 @@ namespace Test | |||
| 13 | namespace Bootstrapper | 13 | namespace Bootstrapper |
| 14 | { | 14 | { |
| 15 | using namespace System; | 15 | using namespace System; |
| 16 | using namespace WixBuildTools::TestSupport; | 16 | using namespace WixInternal::TestSupport; |
| 17 | 17 | ||
| 18 | public ref struct BurnTestException : public SucceededException | 18 | public ref struct BurnTestException : public SucceededException |
| 19 | { | 19 | { |
diff --git a/src/burn/test/BurnUnitTest/BurnTestFixture.h b/src/burn/test/BurnUnitTest/BurnTestFixture.h index 470c81c1..35acba67 100644 --- a/src/burn/test/BurnUnitTest/BurnTestFixture.h +++ b/src/burn/test/BurnUnitTest/BurnTestFixture.h | |||
| @@ -13,7 +13,7 @@ namespace Test | |||
| 13 | namespace Bootstrapper | 13 | namespace Bootstrapper |
| 14 | { | 14 | { |
| 15 | using namespace System; | 15 | using namespace System; |
| 16 | using namespace WixBuildTools::TestSupport; | 16 | using namespace WixInternal::TestSupport; |
| 17 | 17 | ||
| 18 | public ref class BurnTestFixture : IDisposable | 18 | public ref class BurnTestFixture : IDisposable |
| 19 | { | 19 | { |
| @@ -31,7 +31,7 @@ namespace Bootstrapper | |||
| 31 | 31 | ||
| 32 | PlatformInitialize(); | 32 | PlatformInitialize(); |
| 33 | 33 | ||
| 34 | this->testDirectory = WixBuildTools::TestSupport::TestData::Get(); | 34 | this->testDirectory = WixInternal::TestSupport::TestData::Get(); |
| 35 | 35 | ||
| 36 | LogInitialize(::GetModuleHandleW(L"BurnUnitTest.dll")); | 36 | LogInitialize(::GetModuleHandleW(L"BurnUnitTest.dll")); |
| 37 | 37 | ||
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index fe86f042..46708c26 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 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 | 6 | ||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
| @@ -99,5 +99,5 @@ | |||
| 99 | </ItemGroup> | 99 | </ItemGroup> |
| 100 | 100 | ||
| 101 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 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> | 103 | </Project> |
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp index 869e5114..f95c011f 100644 --- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp +++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp | |||
| @@ -23,7 +23,7 @@ namespace Bootstrapper | |||
| 23 | using namespace System; | 23 | using namespace System; |
| 24 | using namespace System::IO; | 24 | using namespace System::IO; |
| 25 | using namespace Xunit; | 25 | using namespace Xunit; |
| 26 | using namespace WixBuildTools::TestSupport; | 26 | using namespace WixInternal::TestSupport; |
| 27 | 27 | ||
| 28 | public ref class RegistrationTest : BurnUnitTest, IClassFixture<TestRegistryFixture^> | 28 | public ref class RegistrationTest : BurnUnitTest, IClassFixture<TestRegistryFixture^> |
| 29 | { | 29 | { |
diff --git a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp index 3d1964c3..310a958a 100644 --- a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp +++ b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp | |||
| @@ -16,7 +16,7 @@ namespace Bootstrapper | |||
| 16 | using namespace System; | 16 | using namespace System; |
| 17 | using namespace System::IO; | 17 | using namespace System::IO; |
| 18 | using namespace Xunit; | 18 | using namespace Xunit; |
| 19 | using namespace WixBuildTools::TestSupport; | 19 | using namespace WixInternal::TestSupport; |
| 20 | 20 | ||
| 21 | public ref class RelatedBundleTest : BurnUnitTest, IClassFixture<TestRegistryFixture^> | 21 | public ref class RelatedBundleTest : BurnUnitTest, IClassFixture<TestRegistryFixture^> |
| 22 | { | 22 | { |
diff --git a/src/burn/test/BurnUnitTest/TestRegistryFixture.cpp b/src/burn/test/BurnUnitTest/TestRegistryFixture.cpp index 89704d09..fe82c4af 100644 --- a/src/burn/test/BurnUnitTest/TestRegistryFixture.cpp +++ b/src/burn/test/BurnUnitTest/TestRegistryFixture.cpp | |||
| @@ -165,7 +165,7 @@ LExit: | |||
| 165 | return ls; | 165 | return ls; |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | namespace WixBuildTools | 168 | namespace WixInternal |
| 169 | { | 169 | { |
| 170 | namespace TestSupport | 170 | namespace TestSupport |
| 171 | { | 171 | { |
diff --git a/src/burn/test/BurnUnitTest/TestRegistryFixture.h b/src/burn/test/BurnUnitTest/TestRegistryFixture.h index 2f283f3e..da070680 100644 --- a/src/burn/test/BurnUnitTest/TestRegistryFixture.h +++ b/src/burn/test/BurnUnitTest/TestRegistryFixture.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 2 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 3 | 3 | ||
| 4 | namespace WixBuildTools | 4 | namespace WixInternal |
| 5 | { | 5 | { |
| 6 | namespace TestSupport | 6 | namespace TestSupport |
| 7 | { | 7 | { |
