Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[AOT] Clean up AOT build issue in Common.UI (#36376)

Browse Source 
* init commit

* Use path.combine

* Add useWPF and useWindowsForms back

---------

Co-authored-by: Yu Leng (from Dev Box) <yuleng@microsoft.com>
This commit is contained in:
moooyo
2025-02-25 02:56:04 +08:00
committed by GitHub
parent f81f65db3d
commit 5cc30df4db
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/Common.UI/Common.UI.csproj
View File

@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<!-- Look at Directory.Build.props in root for common stuff as well --> <!-- Look at Directory.Build.props in root for common stuff as well -->
<Import Project="..\..\Common.Dotnet.CsWinRT.props" /> <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
<Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
<PropertyGroup> <PropertyGroup>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>

10
src/common/Common.UI/SettingsDeepLink.cs
View File

@@ -91,20 +91,20 @@ namespace Common.UI
{ {
try try
{ {
var assemblyPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); var directoryPath = System.AppContext.BaseDirectory;
var fullPath = new DirectoryInfo(assemblyPath).FullName;
if (mainExecutableIsOnTheParentFolder) if (mainExecutableIsOnTheParentFolder)
{ {
// Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application. // Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application.
fullPath = fullPath + "\\..\\PowerToys.exe"; directoryPath = Path.Combine(directoryPath, "..");
directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
} }
else else
{ {
// PowerToys.exe is in the same path as the application. // PowerToys.exe is in the same path as the application.
fullPath = fullPath + "\\PowerToys.exe"; directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
} }
Process.Start(new ProcessStartInfo(fullPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) }); Process.Start(new ProcessStartInfo(directoryPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
} }
catch catch
{ {

2
src/common/Common.UI/ThemeManager.cs
View File

@@ -11,7 +11,7 @@ using Microsoft.Win32;
namespace Common.UI namespace Common.UI
{ {
public class ThemeManager : IDisposable public partial class ThemeManager : IDisposable
{ {
private readonly Application _app; private readonly Application _app;
private const string LightTheme = "Light.Accent1"; private const string LightTheme = "Light.Accent1";