aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2023-09-29 22:23:02 -0700
committerRob Mensching <rob@firegiant.com>2023-12-16 14:32:21 -0800
commite29ef308c5bfbc44319d4b07f171cab1d54bfce9 (patch)
tree06b85fe20831e041499c00bdcd33e40fdedb12c6 /src
parent34132d843795595ccda8cbd5329e290c23b5dbce (diff)
downloadwix-e29ef308c5bfbc44319d4b07f171cab1d54bfce9.tar.gz
wix-e29ef308c5bfbc44319d4b07f171cab1d54bfce9.tar.bz2
wix-e29ef308c5bfbc44319d4b07f171cab1d54bfce9.zip
Update to xunit 2.5.1
Diffstat (limited to 'src')
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp6
-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
4 files changed, 20 insertions, 20 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 7b79a7b8..a3334c78 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -91,9 +91,9 @@
91 <PackageVersion Include="GitInfo" Version="2.3.0" /> 91 <PackageVersion Include="GitInfo" Version="2.3.0" />
92 92
93 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" /> 93 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
94 <PackageVersion Include="xunit" Version="2.5.0" /> 94 <PackageVersion Include="xunit" Version="2.5.1" />
95 <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" /> 95 <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
96 <PackageVersion Include="xunit.assert" Version="2.5.0" /> 96 <PackageVersion Include="xunit.assert" Version="2.5.1" />
97 </ItemGroup> 97 </ItemGroup>
98 98
99 <ItemGroup> 99 <ItemGroup>
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 11f3baed..966acc0a 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.5.0\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.5.0\build\xunit.core.props')" /> 8 <Import Project="$(RepoRootDir)\packages\xunit.core.2.5.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.5.1\build\xunit.core.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')" /> 9 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.1\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 15bdb33e..c070549c 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.5.0\lib\netstandard1.1\xunit.assert.dll</HintPath> 25 <HintPath>$(RootPackagesFolder)xunit.assert.2.5.1\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.5.0\lib\netstandard1.1\xunit.core.dll</HintPath> 28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.5.1\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.5.0\lib\net452\xunit.execution.desktop.dll</HintPath> 31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.5.1\lib\net452\xunit.execution.desktop.dll</HintPath>
32 </Reference> 32 </Reference>
33 </ItemGroup> 33 </ItemGroup>
34 34
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')" /> 35 <Import Project="$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.5.1\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.5.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.0\build\xunit.core.props'))" /> 40 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.props'))" />
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'))" /> 41 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.1\build\xunit.core.targets'))" />
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'))" /> 42 <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.5.1\build\net462\xunit.runner.visualstudio.props'))" />
43 </Target> 43 </Target>
44 44
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' " /> 45 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.5.1\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.5.0\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.1\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 a9afa1fa..3f019c89 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.5.0" /> 10 <package id="xunit.assert" version="2.5.1" />
11 <package id="xunit.core" version="2.5.0" /> 11 <package id="xunit.core" version="2.5.1" />
12 <package id="xunit.extensibility.core" version="2.5.0" /> 12 <package id="xunit.extensibility.core" version="2.5.1" />
13 <package id="xunit.extensibility.execution" version="2.5.0" /> 13 <package id="xunit.extensibility.execution" version="2.5.1" />
14 <package id="xunit.runner.msbuild" version="2.5.0" /> 14 <package id="xunit.runner.msbuild" version="2.5.1" />
15 <package id="xunit.runner.visualstudio" version="2.5.0" /> 15 <package id="xunit.runner.visualstudio" version="2.5.1" />
16</packages> 16</packages>