From 7860559202d01cef07a9996d2c12606ac8d56221 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 27 Apr 2022 16:54:07 -0500
Subject: Use GitInfo in C++/CLI unit test projects to fix Burn's FileSearch
 test

---
 src/burn/test/BurnUnitTest/SearchTest.cpp                               | 2 +-
 .../build/WixBuildTools.TestSupport.Native.targets                      | 2 ++
 src/internal/WixBuildTools.TestSupport.Native/packages.config           | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/burn/test/BurnUnitTest/SearchTest.cpp b/src/burn/test/BurnUnitTest/SearchTest.cpp
index 06ffd017..7efbca2d 100644
--- a/src/burn/test/BurnUnitTest/SearchTest.cpp
+++ b/src/burn/test/BurnUnitTest/SearchTest.cpp
@@ -97,7 +97,7 @@ namespace Bootstrapper
             }
         }
 
-        [Fact(Skip = "Currently fails")]
+        [Fact]
         void FileSearchTest()
         {
             HRESULT hr = S_OK;
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
index 8a171331..48ef7c25 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
@@ -32,11 +32,13 @@
     </Reference>
   </ItemGroup>
 
+  <Import Project="$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" />
   <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\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.1.2\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets'))" />
     <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props'))" />
     <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets'))" />
     <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config
index 2423502c..facb6426 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/packages.config
+++ b/src/internal/WixBuildTools.TestSupport.Native/packages.config
@@ -6,6 +6,7 @@
     Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets
     when any of these versions are updated.
   -->
+  <package id="GitInfo" version="2.1.2" />
   <package id="xunit.abstractions" version="2.0.3" />
   <package id="xunit.assert" version="2.4.1" />
   <package id="xunit.core" version="2.4.1" />
-- 
cgit v1.2.3-55-g6feb