@joebigelow / wix-1 / commits / 78605592

Use GitInfo in C++/CLI unit test projects to fix Burn's FileSearch test

Sean Hall committed Apr 27, 2022 at 16:54 UTC 7860559202d01cef07a9996d2c12606ac8d56221
3 files changed +4 -1
src/burn/test/BurnUnitTest/SearchTest.cpp
+1 -1
@@ -97,7 +97,7 @@ namespace Bootstrapper
97 }
98 }
99
100 - [Fact(Skip = "Currently fails")]
100 + [Fact]
101 void FileSearchTest()
102 {
103 HRESULT hr = S_OK;
src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+2
@@ -32,11 +32,13 @@
32 </Reference>
33 </ItemGroup>
34
35 + <Import Project="$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" />
36 <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" />
37 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
38 <PropertyGroup>
39 <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>
40 </PropertyGroup>
41 + <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets'))" />
42 <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'))" />
43 <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'))" />
44 <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'))" />
src/internal/WixBuildTools.TestSupport.Native/packages.config
+1
@@ -6,6 +6,7 @@
6 Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets
7 when any of these versions are updated.
8 -->
9 + <package id="GitInfo" version="2.1.2" />
10 <package id="xunit.abstractions" version="2.0.3" />
11 <package id="xunit.assert" version="2.4.1" />
12 <package id="xunit.core" version="2.4.1" />