aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorchris_bednarski <Chris.Bednarski@minfos.com.au>2023-07-19 10:11:18 +1000
committerRob Mensching <rob@firegiant.com>2023-07-19 10:17:56 -0700
commitd20b6d41283f2f9decc8ef98cae1d36b09198159 (patch)
tree7fcd4e0324d8e384d24042d4ccc08e62bf2f6f95 /src/internal
parentcef14c6055f85e470ff9ce7a33b53e80d1160ba6 (diff)
downloadwix-d20b6d41283f2f9decc8ef98cae1d36b09198159.tar.gz
wix-d20b6d41283f2f9decc8ef98cae1d36b09198159.tar.bz2
wix-d20b6d41283f2f9decc8ef98cae1d36b09198159.zip
feat(build): update xunit to version 2.5.0, fix occasional test timeout
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp10
-rw-r--r--src/internal/SetBuildNumber/SetBuildNumber.proj2
-rw-r--r--src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props4
-rw-r--r--src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets18
-rw-r--r--src/internal/WixInternal.TestSupport.Native/packages.config12
-rw-r--r--src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs2
6 files changed, 24 insertions, 24 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index a14cf55a..cea1def8 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -86,12 +86,12 @@
86 <!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config --> 86 <!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config -->
87 <ItemGroup> 87 <ItemGroup>
88 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" /> 88 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
89 <PackageVersion Include="GitInfo" Version="2.2.0" /> 89 <PackageVersion Include="GitInfo" Version="2.3.0" />
90 90
91 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" /> 91 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
92 <PackageVersion Include="xunit" Version="2.4.2" /> 92 <PackageVersion Include="xunit" Version="2.5.0" />
93 <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" /> 93 <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
94 <PackageVersion Include="xunit.assert" Version="2.4.2" /> 94 <PackageVersion Include="xunit.assert" Version="2.5.0" />
95 </ItemGroup> 95 </ItemGroup>
96 96
97 <ItemGroup> 97 <ItemGroup>
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index 5e5bf564..cf98234e 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -117,6 +117,6 @@
117 BeforeTargets="AfterBuild" /> 117 BeforeTargets="AfterBuild" />
118 118
119 <ItemGroup> 119 <ItemGroup>
120 <PackageReference Include="GitInfo" Version="2.2.0" /> 120 <PackageReference Include="GitInfo" Version="2.3.0" />
121 </ItemGroup> 121 </ItemGroup>
122</Project> 122</Project>
diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props
index d9d9dab4..11f3baed 100644
--- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props
+++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props
@@ -5,8 +5,8 @@
5 <PropertyGroup> 5 <PropertyGroup>
6 <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> 6 <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir>
7 </PropertyGroup> 7 </PropertyGroup>
8 <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')" /> 8 <Import Project="$(RepoRootDir)\packages\xunit.core.2.5.0\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.5.0\build\xunit.core.props')" />
9 <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')" /> 9 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.0\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.0\build\net462\xunit.runner.visualstudio.props')" />
10 <PropertyGroup> 10 <PropertyGroup>
11 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> 11 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12 </PropertyGroup> 12 </PropertyGroup>
diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
index ed3d728a..15bdb33e 100644
--- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
+++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets
@@ -22,28 +22,28 @@
22 <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> 22 <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
23 </Reference> 23 </Reference>
24 <Reference Include="xunit.assert"> 24 <Reference Include="xunit.assert">
25 <HintPath>$(RootPackagesFolder)xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath> 25 <HintPath>$(RootPackagesFolder)xunit.assert.2.5.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
26 </Reference> 26 </Reference>
27 <Reference Include="xunit.core"> 27 <Reference Include="xunit.core">
28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath> 28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.5.0\lib\netstandard1.1\xunit.core.dll</HintPath>
29 </Reference> 29 </Reference>
30 <Reference Include="xunit.execution.desktop"> 30 <Reference Include="xunit.execution.desktop">
31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath> 31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.5.0\lib\net452\xunit.execution.desktop.dll</HintPath>
32 </Reference> 32 </Reference>
33 </ItemGroup> 33 </ItemGroup>
34 34
35 <Import Project="$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" /> 35 <Import Project="$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.targets')" />
36 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 36 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
37 <PropertyGroup> 37 <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> 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 </PropertyGroup> 39 </PropertyGroup>
40 <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'))" /> 40 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.props'))" />
41 <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'))" /> 41 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.targets'))" />
42 <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'))" /> 42 <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.5.0\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.5.0\build\net462\xunit.runner.visualstudio.props'))" />
43 </Target> 43 </Target>
44 44
45 <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' " /> 45 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.5.0\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " />
46 <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' " /> 46 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.5.0\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " />
47 <Target Name="Test"> 47 <Target Name="Test">
48 <!-- https://xunit.net/docs/running-tests-in-msbuild --> 48 <!-- https://xunit.net/docs/running-tests-in-msbuild -->
49 <!-- https://github.com/xunit/xunit/issues/2188 --> 49 <!-- https://github.com/xunit/xunit/issues/2188 -->
diff --git a/src/internal/WixInternal.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config
index 603b945a..a9afa1fa 100644
--- a/src/internal/WixInternal.TestSupport.Native/packages.config
+++ b/src/internal/WixInternal.TestSupport.Native/packages.config
@@ -7,10 +7,10 @@
7 when any of these versions are updated. 7 when any of these versions are updated.
8 --> 8 -->
9 <package id="xunit.abstractions" version="2.0.3" /> 9 <package id="xunit.abstractions" version="2.0.3" />
10 <package id="xunit.assert" version="2.4.2" /> 10 <package id="xunit.assert" version="2.5.0" />
11 <package id="xunit.core" version="2.4.2" /> 11 <package id="xunit.core" version="2.5.0" />
12 <package id="xunit.extensibility.core" version="2.4.2" /> 12 <package id="xunit.extensibility.core" version="2.5.0" />
13 <package id="xunit.extensibility.execution" version="2.4.2" /> 13 <package id="xunit.extensibility.execution" version="2.5.0" />
14 <package id="xunit.runner.msbuild" version="2.4.2" /> 14 <package id="xunit.runner.msbuild" version="2.5.0" />
15 <package id="xunit.runner.visualstudio" version="2.4.5" /> 15 <package id="xunit.runner.visualstudio" version="2.5.0" />
16</packages> 16</packages>
diff --git a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs
index 083e34f5..1df98d3b 100644
--- a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs
+++ b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs
@@ -91,7 +91,7 @@ namespace WixInternal.TestSupport
91 { 91 {
92 if (collection.Count > 0) 92 if (collection.Count > 0)
93 { 93 {
94 Assert.True(false, $"The collection was expected to be empty, but instead was [{Environment.NewLine}\"{String.Join($"\", {Environment.NewLine}\"", collection)}\"{Environment.NewLine}]"); 94 Assert.Fail($"The collection was expected to be empty, but instead was [{Environment.NewLine}\"{String.Join($"\", {Environment.NewLine}\"", collection)}\"{Environment.NewLine}]");
95 } 95 }
96 } 96 }
97 97