diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-27 16:54:07 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-28 14:23:08 -0500 |
commit | 7860559202d01cef07a9996d2c12606ac8d56221 (patch) | |
tree | d767571c00f58bc62a52d82b35a4e32f5c9f94ee /src | |
parent | c3fa0b4cfe33109244d6f4e1c12d79abb7b28864 (diff) | |
download | wix-7860559202d01cef07a9996d2c12606ac8d56221.tar.gz wix-7860559202d01cef07a9996d2c12606ac8d56221.tar.bz2 wix-7860559202d01cef07a9996d2c12606ac8d56221.zip |
Use GitInfo in C++/CLI unit test projects to fix Burn's FileSearch test
Diffstat (limited to 'src')
3 files changed, 4 insertions, 1 deletions
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 | |||
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | [Fact(Skip = "Currently fails")] | 100 | [Fact] |
101 | void FileSearchTest() | 101 | void FileSearchTest() |
102 | { | 102 | { |
103 | HRESULT hr = S_OK; | 103 | 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 @@ | |||
32 | </Reference> | 32 | </Reference> |
33 | </ItemGroup> | 33 | </ItemGroup> |
34 | 34 | ||
35 | <Import Project="$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" /> | ||
35 | <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.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')" /> |
36 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 37 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
37 | <PropertyGroup> | 38 | <PropertyGroup> |
38 | <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> | 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> |
39 | </PropertyGroup> | 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'))" /> | ||
40 | <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'))" /> | 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'))" /> |
41 | <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'))" /> | 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'))" /> |
42 | <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'))" /> | 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'))" /> |
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 @@ | |||
6 | Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets | 6 | Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets |
7 | when any of these versions are updated. | 7 | when any of these versions are updated. |
8 | --> | 8 | --> |
9 | <package id="GitInfo" version="2.1.2" /> | ||
9 | <package id="xunit.abstractions" version="2.0.3" /> | 10 | <package id="xunit.abstractions" version="2.0.3" /> |
10 | <package id="xunit.assert" version="2.4.1" /> | 11 | <package id="xunit.assert" version="2.4.1" /> |
11 | <package id="xunit.core" version="2.4.1" /> | 12 | <package id="xunit.core" version="2.4.1" /> |