Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[AOT] clean up AOT issue in Settings.UI (#36559)

Browse Source 
* Rename source generation context file

* fix build issue

* fix path bug

---------

Co-authored-by: Yu Leng (from Dev Box) <yuleng@microsoft.com>
This commit is contained in:
moooyo
2025-02-25 02:48:54 +08:00
committed by GitHub
parent 9f008a65d6
commit f81f65db3d
45 changed files with 203 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/settings-ui/Settings.UI/Helpers/ActionMessage.cs Normal file
View File

@@ -0,0 +1,48 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
namespace Microsoft.PowerToys.Settings.UI.Helpers
{
public sealed class ActionMessage
{
[JsonPropertyName("action")]
public SettingsAction Action { get; set; }
public static ActionMessage Create(string actionName)
{
return new ActionMessage
{
Action = new SettingsAction
{
PublishedDate = new SettingsGeneral
{
ActionName = actionName,
},
},
};
}
}
[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Those are just a define for one simple struct")]
public sealed class SettingsAction
{
[JsonPropertyName("general")]
public SettingsGeneral PublishedDate { get; set; }
}
[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Those are just a define for one simple struct")]
public sealed class SettingsGeneral
{
[JsonPropertyName("action_name")]
public string ActionName { get; set; }
}
}

2
src/settings-ui/Settings.UI/Helpers/AsyncCommand.cs
View File

@@ -11,7 +11,7 @@ using System.Windows.Input;
namespace Microsoft.PowerToys.Settings.UI.Helpers
{
internal sealed class AsyncCommand : ICommand
internal sealed partial class AsyncCommand : ICommand
{
private readonly Func<Task> _execute;
private readonly Func<bool> _canExecute;

2
src/settings-ui/Settings.UI/Helpers/IndexedObservableCollection.cs
View File

@@ -27,7 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
}
#pragma warning disable SA1402 // File may only contain a single type
public class IndexedObservableCollection<T> : ObservableCollection<IndexedItem<T>>
public partial class IndexedObservableCollection<T> : ObservableCollection<IndexedItem<T>>
#pragma warning restore SA1402 // File may only contain a single type
{
public IndexedObservableCollection(IEnumerable<T> items)

2
src/settings-ui/Settings.UI/Helpers/NativeKeyboardHelper.cs
View File

@@ -18,7 +18,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
internal static int Size
{
get { return Marshal.SizeOf(typeof(INPUT)); }
get { return Marshal.SizeOf<INPUT>(); }
}
}

29
src/settings-ui/Settings.UI/Helpers/PowerToysReleaseInfo.cs Normal file
View File

@@ -0,0 +1,29 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
namespace Microsoft.PowerToys.Settings.UI.Helpers
{
// Contains information for a release. Used to deserialize release JSON info from GitHub.
public sealed class PowerToysReleaseInfo
{
[JsonPropertyName("published_at")]
public DateTimeOffset PublishedDate { get; set; }
[JsonPropertyName("name")]
public string Name { get; set; }
[JsonPropertyName("tag_name")]
public string TagName { get; set; }
[JsonPropertyName("body")]
public string ReleaseNotes { get; set; }
}
}

4
src/settings-ui/Settings.UI/Helpers/RelayCommand.cs
View File

@@ -7,7 +7,7 @@ using System.Windows.Input;
namespace Microsoft.PowerToys.Settings.UI.Helpers
{
public class RelayCommand : ICommand
public partial class RelayCommand : ICommand
{
private readonly Action _execute;
private readonly Func<bool> _canExecute;
@@ -33,7 +33,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "abstract T and abstract")]
public class RelayCommand<T> : ICommand
public partial class RelayCommand<T> : ICommand
{
private readonly Action<T> execute;

8
src/settings-ui/Settings.UI/Helpers/WindowHelper.cs
View File

@@ -6,7 +6,7 @@ using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Text.Json;
using Microsoft.PowerToys.Settings.UI.SerializationContext;
using Microsoft.UI.Xaml;
namespace Microsoft.PowerToys.Settings.UI.Helpers
@@ -20,9 +20,9 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
try
{
var json = File.ReadAllText(_placementPath);
var placement = JsonSerializer.Deserialize<WINDOWPLACEMENT>(json);
var placement = JsonSerializer.Deserialize<WINDOWPLACEMENT>(json, SourceGenerationContextContext.Default.WINDOWPLACEMENT);
placement.Length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
placement.Length = Marshal.SizeOf<WINDOWPLACEMENT>();
placement.Flags = 0;
placement.ShowCmd = (placement.ShowCmd == NativeMethods.SW_SHOWMAXIMIZED) ? NativeMethods.SW_SHOWMAXIMIZED : NativeMethods.SW_SHOWNORMAL;
return placement;
@@ -40,7 +40,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
_ = NativeMethods.GetWindowPlacement(handle, out var placement);
try
{
var json = JsonSerializer.Serialize(placement);
var json = JsonSerializer.Serialize(placement, SourceGenerationContextContext.Default.WINDOWPLACEMENT);
File.WriteAllText(_placementPath, json);
}
catch (Exception)