aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-07-07 01:23:03 -0700
committerRob Mensching <rob@firegiant.com>2024-07-15 15:21:20 -0700
commit1e390766eb2acf26375275b53d2016b37452af5f (patch)
treea535e74dea3cbcbe7a6664b00021b98a0c323c9d
parent807e41c8de43f3a920e02e7f20f4724e360ae708 (diff)
downloadwix-1e390766eb2acf26375275b53d2016b37452af5f.tar.gz
wix-1e390766eb2acf26375275b53d2016b37452af5f.tar.bz2
wix-1e390766eb2acf26375275b53d2016b37452af5f.zip
Update dependencies
Fixes 8569
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp28
-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/setup/MetadataTask/GenerateMetadata.cs2
5 files changed, 32 insertions, 32 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 0c4b1dfb..827ec1c1 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -41,34 +41,34 @@
41 </ItemGroup> 41 </ItemGroup>
42 42
43 <ItemGroup> 43 <ItemGroup>
44 <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" /> 44 <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
45 <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" /> 45 <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
46 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" /> 46 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" />
47 <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" /> 47 <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" />
48 <PackageVersion Include="System.IO.Compression" Version="4.3.0" /> 48 <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
49 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" /> 49 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
50 <PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" /> 50 <PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
51 <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" /> 51 <PackageVersion Include="System.Reflection.Metadata" Version="1.8.1" />
52 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" /> 52 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
53 <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.7.0" /> 53 <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.7.1" />
54 <PackageVersion Include="System.Text.Json" Version="4.6.0" /> 54 <PackageVersion Include="System.Text.Json" Version="6.0.9" />
55 55
56 <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> 56 <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
57 <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.16.30" /> 57 <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.10.2154" />
58 <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> 58 <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
59 </ItemGroup> 59 </ItemGroup>
60 60
61 <ItemGroup> 61 <ItemGroup>
62 <PackageVersion Include="NuGet.Credentials" Version="6.3.3" /> 62 <PackageVersion Include="NuGet.Credentials" Version="6.10.1" />
63 <PackageVersion Include="NuGet.Protocol" Version="6.3.3" /> 63 <PackageVersion Include="NuGet.Protocol" Version="6.10.1" />
64 <PackageVersion Include="NuGet.Versioning" Version="6.3.3" /> 64 <PackageVersion Include="NuGet.Versioning" Version="6.10.1" />
65 </ItemGroup> 65 </ItemGroup>
66 66
67 <!-- 67 <!--
68 These MSBuild versions are trapped in antiquity for heat.exe. 68 These MSBuild versions are trapped in antiquity for heat.exe.
69 --> 69 -->
70 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" > 70 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
71 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/> 71 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3" />
72 </ItemGroup> 72 </ItemGroup>
73 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"> 73 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
74 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> 74 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
@@ -79,10 +79,10 @@
79 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" /> 79 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
80 <PackageVersion Include="GitInfo" Version="2.3.0" /> 80 <PackageVersion Include="GitInfo" Version="2.3.0" />
81 81
82 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" /> 82 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
83 <PackageVersion Include="xunit" Version="2.5.1" /> 83 <PackageVersion Include="xunit" Version="2.8.1" />
84 <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" /> 84 <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
85 <PackageVersion Include="xunit.assert" Version="2.5.1" /> 85 <PackageVersion Include="xunit.assert" Version="2.8.1" />
86 </ItemGroup> 86 </ItemGroup>
87 87
88 <ItemGroup> 88 <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 966acc0a..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.5.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.5.1\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.5.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.5.1\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 c070549c..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.5.1\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.5.1\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.5.1\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.5.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.5.1\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.5.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.1\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.5.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.5.1\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.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'))" /> 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.5.1\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.5.1\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 3f019c89..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.5.1" /> 10 <package id="xunit.assert" version="2.8.1" />
11 <package id="xunit.core" version="2.5.1" /> 11 <package id="xunit.core" version="2.8.1" />
12 <package id="xunit.extensibility.core" version="2.5.1" /> 12 <package id="xunit.extensibility.core" version="2.8.1" />
13 <package id="xunit.extensibility.execution" version="2.5.1" /> 13 <package id="xunit.extensibility.execution" version="2.8.1" />
14 <package id="xunit.runner.msbuild" version="2.5.1" /> 14 <package id="xunit.runner.msbuild" version="2.8.1" />
15 <package id="xunit.runner.visualstudio" version="2.5.1" /> 15 <package id="xunit.runner.visualstudio" version="2.8.1" />
16</packages> 16</packages>
diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs
index efe4ee39..65e6f7a4 100644
--- a/src/setup/MetadataTask/GenerateMetadata.cs
+++ b/src/setup/MetadataTask/GenerateMetadata.cs
@@ -19,7 +19,7 @@ namespace WixToolset.Tasks
19 private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions 19 private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions
20 { 20 {
21 PropertyNamingPolicy = JsonNamingPolicy.CamelCase, 21 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
22 IgnoreNullValues = true, 22 DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
23 WriteIndented = true, 23 WriteIndented = true,
24 Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) }, 24 Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) },
25 }; 25 };