From c843b47d6233153fa961c6d0e61edf7cedf255bb Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 8 Nov 2022 14:58:05 -0800
Subject: Separate WixInternal content from official WixToolset namespace

---
 .../AssemblyInfo.cpp                               |  17 ----
 .../NativeAssert.h                                 | 104 ---------------------
 .../WixBuildTools.TestSupport.Native.vcxproj       |  74 ---------------
 ...ixBuildTools.TestSupport.Native.vcxproj.filters |  33 -------
 .../build/WixBuildTools.TestSupport.Native.props   |  13 ---
 .../build/WixBuildTools.TestSupport.Native.targets |  54 -----------
 .../packages.config                                |  17 ----
 .../WixBuildTools.TestSupport.Native/precomp.cpp   |   3 -
 .../WixBuildTools.TestSupport.Native/precomp.h     |  11 ---
 9 files changed, 326 deletions(-)
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/packages.config
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/precomp.cpp
 delete mode 100644 src/internal/WixBuildTools.TestSupport.Native/precomp.h

(limited to 'src/internal/WixBuildTools.TestSupport.Native')

diff --git a/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp b/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp
deleted file mode 100644
index 23a48993..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.
-
-#include "precomp.h"
-
-using namespace System::Reflection;
-using namespace System::Runtime::CompilerServices;
-using namespace System::Runtime::InteropServices;
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitleAttribute("WixBuildTools.TestSupport.Native")];
-[assembly: AssemblyDescriptionAttribute("")];
-[assembly: AssemblyCultureAttribute("")];
-[assembly: ComVisible(false)];
diff --git a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
deleted file mode 100644
index b0206b14..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#pragma once
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-
-namespace WixBuildTools {
-namespace TestSupport {
-
-    using namespace System;
-    using namespace System::Collections::Generic;
-    using namespace System::Linq;
-    using namespace Xunit;
-
-    public ref class NativeAssert : WixAssert
-    {
-    public:
-        static void NotNull(LPCWSTR wz)
-        {
-            if (!wz)
-            {
-                Assert::NotNull(nullptr);
-            }
-        }
-
-        // For some reason, naming these NotStringEqual methods "NotEqual" breaks Intellisense in files that call any overload of the NotEqual method.
-        static void NotStringEqual(LPCWSTR expected, LPCWSTR actual)
-        {
-            NativeAssert::NotStringEqual(expected, actual, FALSE);
-        }
-
-        static void NotStringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase)
-        {
-            WixAssert::NotStringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase);
-        }
-
-        // For some reason, naming these StringEqual methods "Equal" breaks Intellisense in files that call any overload of the Equal method.
-        static void StringEqual(LPCWSTR expected, LPCWSTR actual)
-        {
-            NativeAssert::StringEqual(expected, actual, FALSE);
-        }
-
-        static void StringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase)
-        {
-            WixAssert::StringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase);
-        }
-
-        static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs)
-        {
-            array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1);
-            formatArgs[0] = NativeAssert::LPSTRToString(zArg);
-            for (int i = 0; i < zArgs->Length; ++i)
-            {
-                formatArgs[i + 1] = NativeAssert::LPSTRToString(zArgs[i]);
-            }
-            WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs);
-        }
-
-        static void Succeeded(HRESULT hr, LPCSTR zFormat, ... array<LPCWSTR>^ wzArgs)
-        {
-            array<Object^>^ formatArgs = gcnew array<Object^, 1>(wzArgs->Length);
-            for (int i = 0; i < wzArgs->Length; ++i)
-            {
-                formatArgs[i] = NativeAssert::LPWSTRToString(wzArgs[i]);
-            }
-            WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs);
-        }
-
-        static void SpecificReturnCode(HRESULT hrExpected, HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs)
-        {
-            array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1);
-            formatArgs[0] = NativeAssert::LPSTRToString(zArg);
-            for (int i = 0; i < zArgs->Length; ++i)
-            {
-                formatArgs[i + 1] = NativeAssert::LPSTRToString(zArgs[i]);
-            }
-            WixAssert::SpecificReturnCode(hrExpected, hr, gcnew String(zFormat), formatArgs);
-        }
-
-        static void SpecificReturnCode(HRESULT hrExpected, HRESULT hr, LPCSTR zFormat, ... array<LPCWSTR>^ wzArgs)
-        {
-            array<Object^>^ formatArgs = gcnew array<Object^, 1>(wzArgs->Length);
-            for (int i = 0; i < wzArgs->Length; ++i)
-            {
-                formatArgs[i] = NativeAssert::LPWSTRToString(wzArgs[i]);
-            }
-            WixAssert::SpecificReturnCode(hrExpected, hr, gcnew String(zFormat), formatArgs);
-        }
-
-        static void ValidReturnCode(HRESULT hr, ... array<HRESULT>^ validReturnCodes)
-        {
-            Assert::Contains(hr, (IEnumerable<HRESULT>^)validReturnCodes);
-        }
-
-    private:
-        static String^ LPSTRToString(LPCSTR z)
-        {
-            return z ? gcnew String(z) : nullptr;
-        }
-        static String^ LPWSTRToString(LPCWSTR wz)
-        {
-            return wz ? gcnew String(wz) : nullptr;
-        }
-    };
-}
-}
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
deleted file mode 100644
index 47d79745..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="build\WixBuildTools.TestSupport.Native.props" />
-
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
-  <PropertyGroup Label="Globals">
-    <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
-    <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid>
-    <RootNamespace>WixBuildTools::TestSupport</RootNamespace>
-    <Keyword>ManagedCProj</Keyword>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <CLRSupport>true</CLRSupport>
-    <Description>WixBuildTools C++/CLI Test Support</Description>
-    <SignOutput>false</SignOutput>
-    <IsWixTestSupportProject>true</IsWixTestSupportProject>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
-  <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories></ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ClCompile Include="AssemblyInfo.cpp" />
-    <ClCompile Include="precomp.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-      <!-- Warnings from NativeAssert.h from referencing netstandard dlls -->
-      <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ClInclude Include="precomp.h" />
-    <ClInclude Include="NativeAssert.h" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj">
-      <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>
-    </ProjectReference>
-  </ItemGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="build\WixBuildTools.TestSupport.Native.targets" />
-  <Target Name="Pack" DependsOnTargets="Build" />
-</Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters
deleted file mode 100644
index 34c1380f..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="precomp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="NativeAssert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AssemblyInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="precomp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
deleted file mode 100644
index d9d9dab4..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project>
-  <PropertyGroup>
-    <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir>
-  </PropertyGroup>
-  <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.2\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.2\build\xunit.core.props')" />
-  <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
deleted file mode 100644
index 3d28ed57..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-
-  <!-- Include these references only when not referenced by the WixBuildTools.TestSupport.Native.vcxproj -->
-  <ItemGroup Condition="'$(MSBuildProjectName)'!='$(MSBuildThisFileName)'">
-    <Reference Include="WixBuildTools.TestSupport">
-      <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.dll</HintPath>
-    </Reference>
-    <Reference Include="WixBuildTools.TestSupport.Native">
-      <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.Native.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="xunit.abstractions">
-      <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>$(RootPackagesFolder)xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop">
-      <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <Import Project="$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" />
-  <Import Project="$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets'))" />
-    <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props'))" />
-    <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets'))" />
-    <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
-  </Target>
-
-  <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " />
-  <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " />
-  <Target Name="Test">
-    <!-- https://xunit.net/docs/running-tests-in-msbuild -->
-    <!-- https://github.com/xunit/xunit/issues/2188 -->
-    <xunit Assemblies="$(TargetPath)" Xml="$(CppCliTestResultsFile)" />
-  </Target>
-</Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config
deleted file mode 100644
index 060bff6b..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/packages.config
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<packages>
-  <!--
-    Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets
-    when any of these versions are updated.
-  -->
-  <package id="GitInfo" version="2.2.0" />
-  <package id="xunit.abstractions" version="2.0.3" />
-  <package id="xunit.assert" version="2.4.2" />
-  <package id="xunit.core" version="2.4.2" />
-  <package id="xunit.extensibility.core" version="2.4.2" />
-  <package id="xunit.extensibility.execution" version="2.4.2" />
-  <package id="xunit.runner.msbuild" version="2.4.2" />
-  <package id="xunit.runner.visualstudio" version="2.4.5" />
-</packages>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp b/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp
deleted file mode 100644
index 37664a1c..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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.
-
-#include "precomp.h"
diff --git a/src/internal/WixBuildTools.TestSupport.Native/precomp.h b/src/internal/WixBuildTools.TestSupport.Native/precomp.h
deleted file mode 100644
index f54b55be..00000000
--- a/src/internal/WixBuildTools.TestSupport.Native/precomp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-// 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.
-
-
-#include <windows.h>
-#include <strsafe.h>
-
-#include "NativeAssert.h"
-
-#pragma managed
-#include <vcclr.h>
-- 
cgit v1.2.3-55-g6feb