mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-06 03:07:04 +02:00
CmdPal: ApplicationInfoService + fix version in the error report builder (#45374)
## Summary of the Pull Request This PR introduces a new service, ApplicationInfoService, that encapsulates host app state and infrastructure and moves the logic for obtaining version information there. It then uses this information to fix an issue with incorrect version reporting for unpackaged CmdPal in ErrorReportBuilder. - Adds ApplicationInfoService. - Fixes an error in ErrorReportBuilder when the app runs unpackaged. - Adds logging of the app version and environmental info at startup. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #45368 - [x] Closes: #45370 <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
This commit is contained in:
@@ -68,11 +68,13 @@ public partial class App : Application, IDisposable
|
||||
/// </summary>
|
||||
public App()
|
||||
{
|
||||
var appInfoService = new ApplicationInfoService();
|
||||
|
||||
#if !CMDPAL_DISABLE_GLOBAL_ERROR_HANDLER
|
||||
_globalErrorHandler.Register(this, GlobalErrorHandler.Options.Default);
|
||||
_globalErrorHandler.Register(this, GlobalErrorHandler.Options.Default, appInfoService);
|
||||
#endif
|
||||
|
||||
Services = ConfigureServices();
|
||||
Services = ConfigureServices(appInfoService);
|
||||
|
||||
IconCacheProvider.Initialize(Services);
|
||||
|
||||
@@ -93,6 +95,9 @@ public partial class App : Application, IDisposable
|
||||
// This way, log statements from the core project will be captured by the PT logs
|
||||
var logWrapper = new LogWrapper();
|
||||
CoreLogger.InitializeLogger(logWrapper);
|
||||
|
||||
// Now that CoreLogger is initialized, initialize the logger delegate in ApplicationInfoService
|
||||
appInfoService.SetLogDirectory(() => Logger.CurrentVersionLogDirectoryPath);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -110,7 +115,7 @@ public partial class App : Application, IDisposable
|
||||
/// <summary>
|
||||
/// Configures the services for the application
|
||||
/// </summary>
|
||||
private static ServiceProvider ConfigureServices()
|
||||
private static ServiceProvider ConfigureServices(IApplicationInfoService appInfoService)
|
||||
{
|
||||
// TODO: It's in the Labs feed, but we can use Sergio's AOT-friendly source generator for this: https://github.com/CommunityToolkit/Labs-Windows/discussions/463
|
||||
ServiceCollection services = new();
|
||||
@@ -121,7 +126,7 @@ public partial class App : Application, IDisposable
|
||||
|
||||
AddBuiltInCommands(services);
|
||||
|
||||
AddCoreServices(services);
|
||||
AddCoreServices(services, appInfoService);
|
||||
|
||||
AddUIServices(services, dispatcherQueue);
|
||||
|
||||
@@ -197,9 +202,11 @@ public partial class App : Application, IDisposable
|
||||
services.AddIconServices(dispatcherQueue);
|
||||
}
|
||||
|
||||
private static void AddCoreServices(ServiceCollection services)
|
||||
private static void AddCoreServices(ServiceCollection services, IApplicationInfoService appInfoService)
|
||||
{
|
||||
// Core services
|
||||
services.AddSingleton(appInfoService);
|
||||
|
||||
services.AddSingleton<IExtensionService, ExtensionService>();
|
||||
services.AddSingleton<IRunHistoryService, RunHistoryService>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user