aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-07-07 01:23:03 -0700
committerRob Mensching <rob@firegiant.com>2024-10-04 12:51:04 -0700
commitd474b56ced25cabfacda8efea1e61f13644abd23 (patch)
tree92a8aad45be5fc87e51f10d6607cbf713de7e6ab /src/internal
parent956796ee24804b59f2a4d987103e57e5fb68b11c (diff)
downloadwix-d474b56ced25cabfacda8efea1e61f13644abd23.tar.gz
wix-d474b56ced25cabfacda8efea1e61f13644abd23.tar.bz2
wix-d474b56ced25cabfacda8efea1e61f13644abd23.zip
Update dependencies
Fixes 8569
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp29
-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
5 files changed, 33 insertions, 32 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 8ec6f78c..92e13d9a 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -40,19 +40,20 @@
40 </ItemGroup> 40 </ItemGroup>
41 41
42 <ItemGroup> 42 <ItemGroup>
43 <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" /> 43 <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
44 <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" /> 44 <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
45 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" /> 45 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" />
46 <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" /> 46 <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" />
47 <PackageVersion Include="System.IO.Compression" Version="4.3.0" /> 47 <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
48 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" /> 48 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
49 <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" /> 49 <PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
50 <PackageVersion Include="System.Reflection.Metadata" Version="1.8.1" />
50 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" /> 51 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
51 <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.7.0" /> 52 <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.7.1" />
52 <PackageVersion Include="System.Text.Json" Version="4.6.0" /> 53 <PackageVersion Include="System.Text.Json" Version="6.0.9" />
53 54
54 <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> 55 <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
55 <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.16.30" /> 56 <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.10.2154" />
56 <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> 57 <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
57 </ItemGroup> 58 </ItemGroup>
58 59
@@ -68,16 +69,16 @@
68 </ItemGroup> 69 </ItemGroup>
69 70
70 <ItemGroup> 71 <ItemGroup>
71 <PackageVersion Include="NuGet.Credentials" Version="6.3.3" /> 72 <PackageVersion Include="NuGet.Credentials" Version="6.10.1" />
72 <PackageVersion Include="NuGet.Protocol" Version="6.3.3" /> 73 <PackageVersion Include="NuGet.Protocol" Version="6.10.1" />
73 <PackageVersion Include="NuGet.Versioning" Version="6.3.3" /> 74 <PackageVersion Include="NuGet.Versioning" Version="6.10.1" />
74 </ItemGroup> 75 </ItemGroup>
75 76
76 <!-- 77 <!--
77 These MSBuild versions are trapped in antiquity for heat.exe. 78 These MSBuild versions are trapped in antiquity for heat.exe.
78 --> 79 -->
79 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" > 80 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
80 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/> 81 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3" />
81 </ItemGroup> 82 </ItemGroup>
82 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"> 83 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
83 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> 84 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
@@ -88,10 +89,10 @@
88 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" /> 89 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
89 <PackageVersion Include="GitInfo" Version="2.2.0" /> 90 <PackageVersion Include="GitInfo" Version="2.2.0" />
90 91
91 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" /> 92 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
92 <PackageVersion Include="xunit" Version="2.4.2" /> 93 <PackageVersion Include="xunit" Version="2.8.1" />
93 <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" /> 94 <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
94 <PackageVersion Include="xunit.assert" Version="2.4.2" /> 95 <PackageVersion Include="xunit.assert" Version="2.8.1" />
95 </ItemGroup> 96 </ItemGroup>
96 97
97 <ItemGroup> 98 <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 d9d9dab4..2362a8de 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.8.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.8.1\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.8.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.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 ed3d728a..a882ad8d 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.8.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.4.2\lib\netstandard1.1\xunit.core.dll</HintPath> 28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.8.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.4.2\lib\net452\xunit.execution.desktop.dll</HintPath> 31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.8.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.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.8.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.8.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.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.8.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.8.1\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.8.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.8.1\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.8.1\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.8.1\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.8.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.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.8.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 603b945a..21567bf3 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.8.1" />
11 <package id="xunit.core" version="2.4.2" /> 11 <package id="xunit.core" version="2.8.1" />
12 <package id="xunit.extensibility.core" version="2.4.2" /> 12 <package id="xunit.extensibility.core" version="2.8.1" />
13 <package id="xunit.extensibility.execution" version="2.4.2" /> 13 <package id="xunit.extensibility.execution" version="2.8.1" />
14 <package id="xunit.runner.msbuild" version="2.4.2" /> 14 <package id="xunit.runner.msbuild" version="2.8.1" />
15 <package id="xunit.runner.visualstudio" version="2.4.5" /> 15 <package id="xunit.runner.visualstudio" version="2.8.1" />
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