From c19c4b0353546300809987b5783b13109c208635 Mon Sep 17 00:00:00 2001 From: Jeremy Sinclair <4016293+snickler@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:57:16 -0500 Subject: [PATCH] [Deps]Update .NET Packages from 9.0.1 to 9.0.2 (#37400) * [Deps] Update NuGet package versions to 9.0.2 * [CI] Update NOTICE.md * Ignore 0.0.0.0 versions as well for PowerToys files * Verify we're not shipping any 0.0.0.0 files * Add MSFT file that's expected as 0.0.0.0 * Fix spellcheck --------- Co-authored-by: Jaime Bernardo --- .github/actions/spell-check/expect.txt | 1 + .pipelines/verifyDepsJsonLibraryVersions.ps1 | 3 +- .pipelines/versionAndSignCheck.ps1 | 6 +++ Directory.Packages.props | 42 ++++++++++---------- NOTICE.md | 42 ++++++++++---------- 5 files changed, 51 insertions(+), 43 deletions(-) diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 9a0ba0dbe7..17d1e63c0a 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1302,6 +1302,7 @@ regroot regsvr REINSTALLMODE reloadable +Relogger remappings REMAPSUCCESSFUL REMAPUNSUCCESSFUL diff --git a/.pipelines/verifyDepsJsonLibraryVersions.ps1 b/.pipelines/verifyDepsJsonLibraryVersions.ps1 index 3837514b46..a74af1dd7b 100644 --- a/.pipelines/verifyDepsJsonLibraryVersions.ps1 +++ b/.pipelines/verifyDepsJsonLibraryVersions.ps1 @@ -41,10 +41,11 @@ Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZone $dllName = Split-Path $_.Name -leaf if([bool]($_.Value.PSObject.Properties.name -match 'fileVersion')) { $dllFileVersion = $_.Value.fileVersion - if ([string]::IsNullOrEmpty($dllFileVersion) -and $dllName.StartsWith('PowerToys.'))` { + if (([string]::IsNullOrEmpty($dllFileVersion) -or ($dllFileVersion -eq '0.0.0.0')) -and $dllName.StartsWith('PowerToys.'))` { # After VS 17.11 update some of PowerToys dlls have no fileVersion in deps.json even though the # version is correctly set. This is a workaround to skip our dlls as we are confident that all of # our dlls share the same version across the dependencies. + # After VS 17.13 these error versions started appearing as 0.0.0.0 so we've added that case to the condition as well. continue } diff --git a/.pipelines/versionAndSignCheck.ps1 b/.pipelines/versionAndSignCheck.ps1 index 1baf34570e..1970bd6adb 100644 --- a/.pipelines/versionAndSignCheck.ps1 +++ b/.pipelines/versionAndSignCheck.ps1 @@ -19,6 +19,7 @@ $versionExceptions = @( "Microsoft.Xaml.Interactions.dll", "Microsoft.Xaml.Interactivity.dll", "hyjiacan.py4n.dll", + "TraceReloggerLib.dll", "Microsoft.WindowsAppRuntime.Release.Net.dll", "Microsoft.Windows.Widgets.Projection.dll", "WinRT.Host.Shim.dll") -join '|'; @@ -59,6 +60,11 @@ if ($items.Count -eq 0) { } $items | ForEach-Object { + if ($_.VersionInfo.FileVersion -eq "0.0.0.0" -and $_.Name -notmatch $versionExceptions) { + # These items are exceptions that actually have the 0.0.0.0 version. + Write-Host "Version set to 0.0.0.0: " + $_.FullName + $totalFailure++; + } if ($_.VersionInfo.FileVersion -eq "1.0.0.0" -and $_.Name -notmatch $versionExceptions) { # These items are exceptions that actually have the 1.0.0.0 version. Write-Host "Version set to 1.0.0.0: " + $_.FullName diff --git a/Directory.Packages.props b/Directory.Packages.props index c04a97ec80..4b681c95c4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -27,21 +27,21 @@ - + - + - - - - - + + + + + - - + + - + - - - + + + - + - - + + - + - - - - + + + + diff --git a/NOTICE.md b/NOTICE.md index 84c8932282..5891f1ae7f 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1318,21 +1318,21 @@ EXHIBIT A -Mozilla Public License. - Mages 3.0.0 - Markdig.Signed 0.34.0 - MessagePack 2.5.187 -- Microsoft.Bcl.AsyncInterfaces 9.0.1 +- Microsoft.Bcl.AsyncInterfaces 9.0.2 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0 -- Microsoft.Data.Sqlite 9.0.1 +- Microsoft.Data.Sqlite 9.0.2 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16 -- Microsoft.Extensions.DependencyInjection 9.0.1 -- Microsoft.Extensions.Hosting 9.0.1 -- Microsoft.Extensions.Hosting.WindowsServices 9.0.1 -- Microsoft.Extensions.Logging 9.0.1 -- Microsoft.Extensions.Logging.Abstractions 9.0.1 +- Microsoft.Extensions.DependencyInjection 9.0.2 +- Microsoft.Extensions.Hosting 9.0.2 +- Microsoft.Extensions.Hosting.WindowsServices 9.0.2 +- Microsoft.Extensions.Logging 9.0.2 +- Microsoft.Extensions.Logging.Abstractions 9.0.2 - Microsoft.NET.ILLink.Tasks (A) - Microsoft.SemanticKernel 1.15.0 - Microsoft.Toolkit.Uwp.Notifications 7.1.2 - Microsoft.Web.WebView2 1.0.2739.15 -- Microsoft.Win32.SystemEvents 9.0.1 -- Microsoft.Windows.Compatibility 9.0.1 +- Microsoft.Win32.SystemEvents 9.0.2 +- Microsoft.Windows.Compatibility 9.0.2 - Microsoft.Windows.CsWin32 0.2.46-beta - Microsoft.Windows.CsWinRT 2.1.5 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428 @@ -1350,23 +1350,23 @@ EXHIBIT A -Mozilla Public License. - SharpCompress 0.37.2 - StreamJsonRpc 2.19.27 - StyleCop.Analyzers 1.2.0-beta.556 -- System.CodeDom 9.0.1 +- System.CodeDom 9.0.2 - System.CommandLine 2.0.0-beta4.22272.1 -- System.ComponentModel.Composition 9.0.1 -- System.Configuration.ConfigurationManager 9.0.1 -- System.Data.OleDb 9.0.1 +- System.ComponentModel.Composition 9.0.2 +- System.Configuration.ConfigurationManager 9.0.2 +- System.Data.OleDb 9.0.2 - System.Data.SqlClient 4.8.6 -- System.Diagnostics.EventLog 9.0.1 -- System.Diagnostics.PerformanceCounter 9.0.1 -- System.Drawing.Common 9.0.1 +- System.Diagnostics.EventLog 9.0.2 +- System.Diagnostics.PerformanceCounter 9.0.2 +- System.Drawing.Common 9.0.2 - System.IO.Abstractions 21.0.29 - System.IO.Abstractions.TestingHelpers 21.0.29 -- System.Management 9.0.1 +- System.Management 9.0.2 - System.Reactive 6.0.1 -- System.Runtime.Caching 9.0.1 -- System.ServiceProcess.ServiceController 9.0.1 -- System.Text.Encoding.CodePages 9.0.1 -- System.Text.Json 9.0.1 +- System.Runtime.Caching 9.0.2 +- System.ServiceProcess.ServiceController 9.0.2 +- System.Text.Encoding.CodePages 9.0.2 +- System.Text.Json 9.0.2 - UnicodeInformation 2.6.0 - UnitsNet 5.56.0 - UTF.Unknown 2.5.1