From 3aec0a06ac21ba5ab191cde5b8e663312699f2d1 Mon Sep 17 00:00:00 2001 From: leileizhang Date: Mon, 9 Dec 2024 10:17:38 +0800 Subject: [PATCH] [AOT compatible] Resolve AOT Build Error in Peek.UI (#36194) * add partial for aot support * add Microsoft.NET.ILLink.Tasks to packages.props * format * Revert "format" This reverts commit 742d5e22148a5ce36517b346521836a37ccc01e4. * add Microsoft.NET.ILLink.Tasks to notice.md * add auto reference * update script to remove the 'Auto-reference line' --------- Co-authored-by: Jaime Bernardo --- .pipelines/verifyNoticeMdAgainstNugetPackages.ps1 | 6 ++++++ NOTICE.md | 1 + src/modules/peek/Peek.UI/Models/NeighboringItems.cs | 2 +- .../peek/Peek.UI/Models/NeighboringItemsEnumerator.cs | 2 +- src/modules/peek/Peek.UI/Peek.UI.csproj | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 b/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 index 2ee58da745..ebef8412a7 100644 --- a/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 +++ b/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1 @@ -46,8 +46,14 @@ $totalList = $projFiles | ForEach-Object -Parallel { foreach($p in $temp) { + # ignore "Auto-referenced" string in the output + if ($p -match "Auto-referenced") { + continue + } + # breaking item down to usable array and getting 1 and 2, see below of a sample output # > PACKAGE VERSION VERSION + # if a package is Auto-referenced, "(A)" will appear in position 1 instead of a version number. $p = -split $p $p = $p[1, 2] diff --git a/NOTICE.md b/NOTICE.md index 78a1f0e1cd..431e84e97c 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1326,6 +1326,7 @@ EXHIBIT A -Mozilla Public License. - Microsoft.Extensions.Hosting.WindowsServices 9.0.0 - Microsoft.Extensions.Logging 9.0.0 - Microsoft.Extensions.Logging.Abstractions 9.0.0 +- Microsoft.NET.ILLink.Tasks (A) - Microsoft.Toolkit.Uwp.Notifications 7.1.2 - Microsoft.Web.WebView2 1.0.2739.15 - Microsoft.Win32.SystemEvents 9.0.0 diff --git a/src/modules/peek/Peek.UI/Models/NeighboringItems.cs b/src/modules/peek/Peek.UI/Models/NeighboringItems.cs index f6a9a744f3..c528cc2b7e 100644 --- a/src/modules/peek/Peek.UI/Models/NeighboringItems.cs +++ b/src/modules/peek/Peek.UI/Models/NeighboringItems.cs @@ -10,7 +10,7 @@ using Peek.UI.Extensions; namespace Peek.UI.Models { - public class NeighboringItems : IReadOnlyList + public partial class NeighboringItems : IReadOnlyList { public IFileSystemItem this[int index] => Items[index] = Items[index] ?? ShellItemArray.GetItemAt(index).ToIFileSystemItem(); diff --git a/src/modules/peek/Peek.UI/Models/NeighboringItemsEnumerator.cs b/src/modules/peek/Peek.UI/Models/NeighboringItemsEnumerator.cs index cedc1570e3..219ea602ac 100644 --- a/src/modules/peek/Peek.UI/Models/NeighboringItemsEnumerator.cs +++ b/src/modules/peek/Peek.UI/Models/NeighboringItemsEnumerator.cs @@ -10,7 +10,7 @@ using Peek.Common.Models; namespace Peek.UI.Models { - public class NeighboringItemsEnumerator : IEnumerator + public partial class NeighboringItemsEnumerator : IEnumerator { public IFileSystemItem Current => Items[CurrentIndex]; diff --git a/src/modules/peek/Peek.UI/Peek.UI.csproj b/src/modules/peek/Peek.UI/Peek.UI.csproj index 357f11a5a3..cb643252f1 100644 --- a/src/modules/peek/Peek.UI/Peek.UI.csproj +++ b/src/modules/peek/Peek.UI/Peek.UI.csproj @@ -2,6 +2,7 @@ + PowerToys.Peek.UI