diff --git a/.pipelines/verifyDepsJsonLibraryVersions.ps1 b/.pipelines/verifyDepsJsonLibraryVersions.ps1 index f6cf4c86da..16ef379188 100644 --- a/.pipelines/verifyDepsJsonLibraryVersions.ps1 +++ b/.pipelines/verifyDepsJsonLibraryVersions.ps1 @@ -41,7 +41,13 @@ 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.'))` { + # 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. + continue + } + # Add the entry to the dictionary of dictionary of lists if(-Not $referencedFileVersionsPerDll.ContainsKey($dllName)) { $referencedFileVersionsPerDll[$dllName] = @{ $dllFileVersion = New-Object System.Collections.Generic.List[System.String] } diff --git a/Directory.Build.props b/Directory.Build.props index b9fff74445..345b75839f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,13 +14,13 @@ true Recommended <_SkipUpgradeNetAnalyzersNuGetWarning>true - false + false $(Platform) $(Version).0 - https://github.com/microsoft/PowerToys + https://github.com/microsoft/PowerToys GitHub true @@ -34,7 +34,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Directory.Packages.props b/Directory.Packages.props index bbf98c9616..e5b9c43a43 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,7 +38,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index b682ec1df4..38208d4835 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1329,7 +1329,7 @@ EXHIBIT A -Mozilla Public License. - Microsoft.Win32.SystemEvents 8.0.0 - Microsoft.Windows.Compatibility 8.0.7 - Microsoft.Windows.CsWin32 0.2.46-beta -- Microsoft.Windows.CsWinRT 2.0.4 +- Microsoft.Windows.CsWinRT 2.0.8 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428 - Microsoft.WindowsAppSDK 1.5.240428000 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9 diff --git a/src/modules/fancyzones/FancyZonesLib/GuidUtils.h b/src/modules/fancyzones/FancyZonesLib/GuidUtils.h index 7b3e1a97cf..cbe0734b5a 100644 --- a/src/modules/fancyzones/FancyZonesLib/GuidUtils.h +++ b/src/modules/fancyzones/FancyZonesLib/GuidUtils.h @@ -16,7 +16,9 @@ namespace std size_t operator()(const GUID& Value) const { RPC_STATUS status = RPC_S_OK; - return ::UuidHash(&const_cast(Value), &status); + // Make a copy of the Value to avoid using const_cast to cast away cost - workaround C26492 + GUID copy = Value; + return ::UuidHash(©, &status); } }; }