diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt index 6f2fd548b2..ab49292d30 100644 --- a/.github/actions/spell-check/excludes.txt +++ b/.github/actions/spell-check/excludes.txt @@ -3,11 +3,11 @@ (?:^|/)(?i)LICEN[CS]E (?:^|/)3rdparty/ (?:^|/)go\.sum$ -(?:^|/)FilePreviewCommon/customLanguages/ -(?:^|/)FilePreviewCommon/generateLanguagesJson.html -(?:^|/)FilePreviewCommon/index.html -(?:^|/)FilePreviewCommon/monaco_languages.json -(?:^|/)FilePreviewCommon/monacoSpecialLanguages.js +(?:^|/)FilePreviewCommon/Assets/Monaco/customLanguages/ +(?:^|/)FilePreviewCommon/Assets/Monaco/generateLanguagesJson.html +(?:^|/)FilePreviewCommon/Assets/Monaco/index.html +(?:^|/)FilePreviewCommon/Assets/Monaco/monaco_languages.json +(?:^|/)FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js (?:^|/)monacoSRC/ (?:^|/)package(?:-lock|)\.json$ (?:^|/)timezones\.json$ @@ -98,7 +98,7 @@ ^src/common/logger/logger\.vcxproj\.filters$ ^src/common/notifications/BackgroundActivatorDLL/BackgroundActivator\.vcxproj\.filters$ ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$ -^src/modules/colorPicker/ColorPickerUI/Resources/colorPicker\.cur$ +^src/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/colorPicker\.cur$ ^src/modules/fancyzones/lib/FancyZonesWinHookEventIDs\.h$ ^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$ ^src/modules/imageresizer/dll/ImageResizerExt\.rgs$ diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 9c97c8dba7..a40869a56b 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1275,6 +1275,7 @@ MOVESIZESTART mozilla mpmc MRM +MRT mru mrw msbuild @@ -2385,6 +2386,7 @@ Wwan Wwanpp XAttribute XAxis +xbf Xbox XBUTTON XBUTTONDBLCLK diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 7bcafc06bc..0bc1ce432f 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -26,158 +26,158 @@ "PowerToys.GPOWrapperProjection.dll", "PowerToys.AllExperiments.dll", - "modules\\AlwaysOnTop\\PowerToys.AlwaysOnTop.exe", - "modules\\AlwaysOnTop\\PowerToys.AlwaysOnTopModuleInterface.dll", + "PowerToys.AlwaysOnTop.exe", + "PowerToys.AlwaysOnTopModuleInterface.dll", - "modules\\ColorPicker\\PowerToys.ColorPicker.dll", - "modules\\ColorPicker\\PowerToys.ColorPickerUI.dll", - "modules\\ColorPicker\\PowerToys.ColorPickerUI.exe", + "PowerToys.ColorPicker.dll", + "PowerToys.ColorPickerUI.dll", + "PowerToys.ColorPickerUI.exe", - "modules\\PowerOCR\\PowerToys.PowerOCRModuleInterface.dll", - "modules\\PowerOCR\\PowerToys.PowerOCR.dll", - "modules\\PowerOCR\\PowerToys.PowerOCR.exe", + "PowerToys.PowerOCRModuleInterface.dll", + "PowerToys.PowerOCR.dll", + "PowerToys.PowerOCR.exe", - "modules\\PastePlain\\PowerToys.PastePlainModuleInterface.dll", + "PowerToys.PastePlainModuleInterface.dll", - "modules\\Awake\\PowerToys.AwakeModuleInterface.dll", - "modules\\Awake\\PowerToys.Awake.exe", - "modules\\Awake\\PowerToys.Awake.dll", + "PowerToys.AwakeModuleInterface.dll", + "PowerToys.Awake.exe", + "PowerToys.Awake.dll", - "modules\\FancyZones\\fancyzones.dll", - "modules\\FancyZones\\PowerToys.FancyZonesEditor.exe", - "modules\\FancyZones\\PowerToys.FancyZonesEditor.dll", - "modules\\FancyZones\\PowerToys.FancyZonesModuleInterface.dll", - "modules\\FancyZones\\PowerToys.FancyZones.exe", + "fancyzones.dll", + "PowerToys.FancyZonesEditor.exe", + "PowerToys.FancyZonesEditor.dll", + "PowerToys.FancyZonesModuleInterface.dll", + "PowerToys.FancyZones.exe", - "modules\\FileExplorerPreview\\PowerToys.GcodePreviewHandler.dll", - "modules\\FileExplorerPreview\\PowerToys.GcodePreviewHandler.exe", - "modules\\FileExplorerPreview\\PowerToys.GcodePreviewHandlerCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.GcodeThumbnailProvider.dll", - "modules\\FileExplorerPreview\\PowerToys.GcodeThumbnailProvider.exe", - "modules\\FileExplorerPreview\\PowerToys.GcodeThumbnailProviderCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.ManagedTelemetry.dll", - "modules\\FileExplorerPreview\\PowerToys.MarkdownPreviewHandler.dll", - "modules\\FileExplorerPreview\\PowerToys.MarkdownPreviewHandler.exe", - "modules\\FileExplorerPreview\\PowerToys.MarkdownPreviewHandlerCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.MonacoPreviewHandler.dll", - "modules\\FileExplorerPreview\\PowerToys.MonacoPreviewHandler.exe", - "modules\\FileExplorerPreview\\PowerToys.MonacoPreviewHandlerCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.PdfPreviewHandler.dll", - "modules\\FileExplorerPreview\\PowerToys.PdfPreviewHandler.exe", - "modules\\FileExplorerPreview\\PowerToys.PdfPreviewHandlerCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.PdfThumbnailProvider.dll", - "modules\\FileExplorerPreview\\PowerToys.PdfThumbnailProvider.exe", - "modules\\FileExplorerPreview\\PowerToys.PdfThumbnailProviderCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.powerpreview.dll", - "modules\\FileExplorerPreview\\PowerToys.PreviewHandlerCommon.dll", - "modules\\FileExplorerPreview\\PowerToys.StlThumbnailProvider.dll", - "modules\\FileExplorerPreview\\PowerToys.StlThumbnailProvider.exe", - "modules\\FileExplorerPreview\\PowerToys.StlThumbnailProviderCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.SvgPreviewHandler.dll", - "modules\\FileExplorerPreview\\PowerToys.SvgPreviewHandler.exe", - "modules\\FileExplorerPreview\\PowerToys.SvgPreviewHandlerCpp.dll", - "modules\\FileExplorerPreview\\PowerToys.SvgThumbnailProvider.dll", - "modules\\FileExplorerPreview\\PowerToys.SvgThumbnailProvider.exe", - "modules\\FileExplorerPreview\\PowerToys.SvgThumbnailProviderCpp.dll", + "PowerToys.GcodePreviewHandler.dll", + "PowerToys.GcodePreviewHandler.exe", + "PowerToys.GcodePreviewHandlerCpp.dll", + "PowerToys.GcodeThumbnailProvider.dll", + "PowerToys.GcodeThumbnailProvider.exe", + "PowerToys.GcodeThumbnailProviderCpp.dll", + "PowerToys.ManagedTelemetry.dll", + "PowerToys.MarkdownPreviewHandler.dll", + "PowerToys.MarkdownPreviewHandler.exe", + "PowerToys.MarkdownPreviewHandlerCpp.dll", + "PowerToys.MonacoPreviewHandler.dll", + "PowerToys.MonacoPreviewHandler.exe", + "PowerToys.MonacoPreviewHandlerCpp.dll", + "PowerToys.PdfPreviewHandler.dll", + "PowerToys.PdfPreviewHandler.exe", + "PowerToys.PdfPreviewHandlerCpp.dll", + "PowerToys.PdfThumbnailProvider.dll", + "PowerToys.PdfThumbnailProvider.exe", + "PowerToys.PdfThumbnailProviderCpp.dll", + "PowerToys.powerpreview.dll", + "PowerToys.PreviewHandlerCommon.dll", + "PowerToys.StlThumbnailProvider.dll", + "PowerToys.StlThumbnailProvider.exe", + "PowerToys.StlThumbnailProviderCpp.dll", + "PowerToys.SvgPreviewHandler.dll", + "PowerToys.SvgPreviewHandler.exe", + "PowerToys.SvgPreviewHandlerCpp.dll", + "PowerToys.SvgThumbnailProvider.dll", + "PowerToys.SvgThumbnailProvider.exe", + "PowerToys.SvgThumbnailProviderCpp.dll", - "modules\\Hosts\\PowerToys.HostsModuleInterface.dll", - "modules\\Hosts\\PowerToys.Hosts.dll", - "modules\\Hosts\\PowerToys.Hosts.exe", + "WinUI3Apps\\PowerToys.HostsModuleInterface.dll", + "WinUI3Apps\\PowerToys.Hosts.dll", + "WinUI3Apps\\PowerToys.Hosts.exe", - "modules\\FileLocksmith\\PowerToys.FileLocksmithLib.Interop.dll", - "modules\\FileLocksmith\\PowerToys.FileLocksmithExt.dll", - "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.exe", - "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.dll", + "WinUI3Apps\\PowerToys.FileLocksmithLib.Interop.dll", + "WinUI3Apps\\PowerToys.FileLocksmithExt.dll", + "WinUI3Apps\\PowerToys.FileLocksmithUI.exe", + "WinUI3Apps\\PowerToys.FileLocksmithUI.dll", - "modules\\Peek\\Peek.Common.dll", - "modules\\Peek\\Peek.FilePreviewer.dll", - "modules\\Peek\\Powertoys.Peek.UI.dll", - "modules\\Peek\\Powertoys.Peek.UI.exe", - "modules\\Peek\\Powertoys.Peek.dll", + "WinUI3Apps\\Peek.Common.dll", + "WinUI3Apps\\Peek.FilePreviewer.dll", + "WinUI3Apps\\Powertoys.Peek.UI.dll", + "WinUI3Apps\\Powertoys.Peek.UI.exe", + "WinUI3Apps\\Powertoys.Peek.dll", - "modules\\ImageResizer\\PowerToys.ImageResizer.exe", - "modules\\ImageResizer\\PowerToys.ImageResizer.dll", - "modules\\ImageResizer\\PowerToys.ImageResizerExt.dll", - "modules\\ImageResizer\\PowerToys.ImageResizerContextMenu.dll", - "modules\\ImageResizer\\ImageResizerContextMenuPackage.msix", + "PowerToys.ImageResizer.exe", + "PowerToys.ImageResizer.dll", + "PowerToys.ImageResizerExt.dll", + "PowerToys.ImageResizerContextMenu.dll", + "ImageResizerContextMenuPackage.msix", - "modules\\KeyboardManager\\PowerToys.KeyboardManager.dll", - "modules\\KeyboardManager\\KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe", - "modules\\KeyboardManager\\KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe", + "PowerToys.KeyboardManager.dll", + "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe", + "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe", - "modules\\launcher\\PowerToys.Launcher.dll", - "modules\\launcher\\PowerToys.PowerLauncher.dll", - "modules\\launcher\\PowerToys.PowerLauncher.exe", - "modules\\launcher\\PowerToys.PowerLauncher.Telemetry.dll", - "modules\\launcher\\Wox.dll", - "modules\\launcher\\Wox.Infrastructure.dll", - "modules\\launcher\\Wox.Plugin.dll", - "modules\\launcher\\Plugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll", - "modules\\launcher\\Plugins\\Folder\\Microsoft.Plugin.Folder.dll", - "modules\\launcher\\Plugins\\Indexer\\Microsoft.Plugin.Indexer.dll", - "modules\\launcher\\Plugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll", - "modules\\launcher\\Plugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll", - "modules\\launcher\\Plugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll", - "modules\\launcher\\Plugins\\Program\\Microsoft.Plugin.Program.dll", - "modules\\launcher\\Plugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll", - "modules\\launcher\\Plugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll", - "modules\\launcher\\Plugins\\Shell\\Microsoft.Plugin.Shell.dll", - "modules\\launcher\\Plugins\\Uri\\Microsoft.Plugin.Uri.dll", - "modules\\launcher\\Plugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll", - "modules\\launcher\\Plugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll", - "modules\\launcher\\Plugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll", - "modules\\launcher\\Plugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll", - "modules\\launcher\\Plugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll", - "modules\\launcher\\Plugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll", - "modules\\launcher\\Plugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll", - "modules\\launcher\\Plugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll", - "modules\\launcher\\Plugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll", + "PowerToys.Launcher.dll", + "PowerToys.PowerLauncher.dll", + "PowerToys.PowerLauncher.exe", + "PowerToys.PowerLauncher.Telemetry.dll", + "Wox.dll", + "Wox.Infrastructure.dll", + "Wox.Plugin.dll", + "RunPlugins\\Calculator\\Microsoft.PowerToys.Run.Plugin.Calculator.dll", + "RunPlugins\\Folder\\Microsoft.Plugin.Folder.dll", + "RunPlugins\\Indexer\\Microsoft.Plugin.Indexer.dll", + "RunPlugins\\OneNote\\Microsoft.PowerToys.Run.Plugin.OneNote.dll", + "RunPlugins\\History\\Microsoft.PowerToys.Run.Plugin.History.dll", + "RunPlugins\\PowerToys\\Microsoft.PowerToys.Run.Plugin.PowerToys.dll", + "RunPlugins\\Program\\Microsoft.Plugin.Program.dll", + "RunPlugins\\Registry\\Microsoft.PowerToys.Run.Plugin.Registry.dll", + "RunPlugins\\WindowsSettings\\Microsoft.PowerToys.Run.Plugin.WindowsSettings.dll", + "RunPlugins\\Shell\\Microsoft.Plugin.Shell.dll", + "RunPlugins\\Uri\\Microsoft.Plugin.Uri.dll", + "RunPlugins\\WindowWalker\\Microsoft.Plugin.WindowWalker.dll", + "RunPlugins\\UnitConverter\\Community.PowerToys.Run.Plugin.UnitConverter.dll", + "RunPlugins\\VSCodeWorkspaces\\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.dll", + "RunPlugins\\Service\\Microsoft.PowerToys.Run.Plugin.Service.dll", + "RunPlugins\\System\\Microsoft.PowerToys.Run.Plugin.System.dll", + "RunPlugins\\TimeDate\\Microsoft.PowerToys.Run.Plugin.TimeDate.dll", + "RunPlugins\\ValueGenerator\\Community.PowerToys.Run.Plugin.ValueGenerator.dll", + "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll", + "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll", - "modules\\MeasureTool\\PowerToys.MeasureToolModuleInterface.dll", - "modules\\MeasureTool\\PowerToys.MeasureToolCore.dll", - "modules\\MeasureTool\\PowerToys.MeasureToolUI.dll", - "modules\\MeasureTool\\PowerToys.MeasureToolUI.exe", + "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll", + "WinUI3Apps\\PowerToys.MeasureToolCore.dll", + "WinUI3Apps\\PowerToys.MeasureToolUI.dll", + "WinUI3Apps\\PowerToys.MeasureToolUI.exe", - "modules\\MouseUtils\\PowerToys.FindMyMouse.dll", - "modules\\MouseUtils\\PowerToys.MouseHighlighter.dll", - "modules\\MouseUtils\\PowerToys.MouseJump.dll", - "modules\\MouseUtils\\PowerToys.MousePointerCrosshairs.dll", - "modules\\MouseUtils\\MouseJumpUI\\PowerToys.MouseJumpUI.dll", - "modules\\MouseUtils\\MouseJumpUI\\PowerToys.MouseJumpUI.exe", + "PowerToys.FindMyMouse.dll", + "PowerToys.MouseHighlighter.dll", + "PowerToys.MouseJump.dll", + "PowerToys.MousePointerCrosshairs.dll", + "PowerToys.MouseJumpUI.dll", + "PowerToys.MouseJumpUI.exe", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBorders.dll", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBorders.exe", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersModuleInterface.dll", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersService.dll", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersService.exe", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersHelper.dll", - "modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBordersHelper.exe", + "PowerToys.MouseWithoutBorders.dll", + "PowerToys.MouseWithoutBorders.exe", + "PowerToys.MouseWithoutBordersModuleInterface.dll", + "PowerToys.MouseWithoutBordersService.dll", + "PowerToys.MouseWithoutBordersService.exe", + "PowerToys.MouseWithoutBordersHelper.dll", + "PowerToys.MouseWithoutBordersHelper.exe", - "modules\\PowerAccent\\PowerAccent.Core.dll", - "modules\\PowerAccent\\PowerToys.PowerAccent.dll", - "modules\\PowerAccent\\PowerToys.PowerAccent.exe", - "modules\\PowerAccent\\PowerToys.PowerAccentModuleInterface.dll", - "modules\\PowerAccent\\PowerToys.PowerAccentKeyboardService.dll", + "PowerAccent.Core.dll", + "PowerToys.PowerAccent.dll", + "PowerToys.PowerAccent.exe", + "PowerToys.PowerAccentModuleInterface.dll", + "PowerToys.PowerAccentKeyboardService.dll", - "modules\\PowerRename\\PowerToys.PowerRenameExt.dll", - "modules\\PowerRename\\PowerToys.PowerRename.exe", - "modules\\PowerRename\\PowerToys.PowerRenameContextMenu.dll", - "modules\\PowerRename\\PowerRenameContextMenuPackage.msix", + "WinUI3Apps\\PowerToys.PowerRenameExt.dll", + "WinUI3Apps\\PowerToys.PowerRename.exe", + "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll", + "WinUI3Apps\\PowerRenameContextMenuPackage.msix", - "modules\\RegistryPreview\\PowerToys.RegistryPreviewExt.dll", - "modules\\RegistryPreview\\PowerToys.RegistryPreview.dll", - "modules\\RegistryPreview\\PowerToys.RegistryPreview.exe", + "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll", + "WinUI3Apps\\PowerToys.RegistryPreview.dll", + "WinUI3Apps\\PowerToys.RegistryPreview.exe", - "modules\\ShortcutGuide\\ShortcutGuide\\PowerToys.ShortcutGuide.exe", - "modules\\ShortcutGuide\\ShortcutGuideModuleInterface\\PowerToys.ShortcutGuideModuleInterface.dll", + "PowerToys.ShortcutGuide.exe", + "PowerToys.ShortcutGuideModuleInterface.dll", - "modules\\VideoConference\\PowerToys.VideoConferenceModule.dll", - "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x86.dll", - "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x64.dll", - "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_arm64.dll", + "PowerToys.VideoConferenceModule.dll", + "PowerToys.VideoConferenceProxyFilter_x86.dll", + "PowerToys.VideoConferenceProxyFilter_x64.dll", + "PowerToys.VideoConferenceProxyFilter_arm64.dll", - "Settings\\PowerToys.Settings.dll", - "Settings\\PowerToys.Settings.exe" + "WinUI3Apps\\PowerToys.Settings.dll", + "WinUI3Apps\\PowerToys.Settings.exe" ], "SigningInfo": { "Operations": [ @@ -237,7 +237,7 @@ "HelixToolkit.Core.Wpf.dll", "Mages.Core.dll", "JetBrains.Annotations.dll", - "NLog.Extensions.Logging.dll", + "NLog.Extensions.Logging.dll", "concrt140_app.dll", "msvcp140_1_app.dll", "msvcp140_2_app.dll", @@ -247,46 +247,38 @@ "vcomp140_app.dll", "vcruntime140_1_app.dll", "vcruntime140_app.dll", - "modules\\FileLocksmith\\CommunityToolkit.Labs.WinUI.SettingsControls.dll", - "modules\\PowerAccent\\UnicodeInformation.dll", - "modules\\PowerAccent\\Vanara.Core.dll", - "modules\\PowerAccent\\Vanara.PInvoke.ComCtl32.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Cryptography.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Gdi32.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Kernel32.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Ole.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Rpc.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Security.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Shared.dll", - "modules\\PowerAccent\\Vanara.PInvoke.Shell32.dll", - "modules\\PowerAccent\\Vanara.PInvoke.ShlwApi.dll", - "modules\\PowerAccent\\Vanara.PInvoke.User32.dll", - "modules\\RegistryPreview\\clrcompression.dll", - "modules\\RegistryPreview\\Microsoft.Graphics.Canvas.Interop.dll", - "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.Core.dll", - "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.WinForms.dll", - "modules\\FileExplorerPreview\\Microsoft.Web.WebView2.Wpf.dll", - "modules\\FileExplorerPreview\\WebView2Loader.dll", - "modules\\Hosts\\Microsoft.Graphics.Canvas.Interop.dll", - "modules\\Hosts\\clrcompression.dll", - "modules\\launcher\\e_sqlite3.dll", - "modules\\launcher\\LazyCache.dll", - "modules\\launcher\\SQLitePCLRaw.batteries_v2.dll", - "modules\\launcher\\SQLitePCLRaw.core.dll", - "modules\\launcher\\SQLitePCLRaw.provider.e_sqlite3.dll", - "modules\\launcher\\ScipBe.Common.Office.OneNote.dll", - "modules\\launcher\\Interop.Microsoft.Office.Interop.OneNote.dll", - "modules\\launcher\\hyjiacan.py4n.dll", - "modules\\MouseWithoutBorders\\MessagePack.Annotations.dll", - "modules\\MouseWithoutBorders\\MessagePack.dll", - "modules\\MouseWithoutBorders\\Nerdbank.Streams.dll", - "modules\\Peek\\SharpCompress.dll", - "Settings\\Microsoft.Graphics.Canvas.Interop.dll", - "Settings\\clrcompression.dll", - "Settings\\CommunityToolkit.Labs.WinUI.SettingsControls.dll", - "Settings\\MessagePack.Annotations.dll", - "Settings\\MessagePack.dll", - "Settings\\Nerdbank.Streams.dll", + "WinUI3Apps\\CommunityToolkit.Labs.WinUI.SettingsControls.dll", + "UnicodeInformation.dll", + "Vanara.Core.dll", + "Vanara.PInvoke.ComCtl32.dll", + "Vanara.PInvoke.Cryptography.dll", + "Vanara.PInvoke.Gdi32.dll", + "Vanara.PInvoke.Kernel32.dll", + "Vanara.PInvoke.Ole.dll", + "Vanara.PInvoke.Rpc.dll", + "Vanara.PInvoke.Security.dll", + "Vanara.PInvoke.Shared.dll", + "Vanara.PInvoke.Shell32.dll", + "Vanara.PInvoke.ShlwApi.dll", + "Vanara.PInvoke.User32.dll", + "WinUI3Apps\\clrcompression.dll", + "WinUI3Apps\\Microsoft.Graphics.Canvas.Interop.dll", + "Microsoft.Web.WebView2.Core.dll", + "Microsoft.Web.WebView2.WinForms.dll", + "Microsoft.Web.WebView2.Wpf.dll", + "WebView2Loader.dll", + "e_sqlite3.dll", + "LazyCache.dll", + "SQLitePCLRaw.batteries_v2.dll", + "SQLitePCLRaw.core.dll", + "SQLitePCLRaw.provider.e_sqlite3.dll", + "ScipBe.Common.Office.OneNote.dll", + "Interop.Microsoft.Office.Interop.OneNote.dll", + "hyjiacan.py4n.dll", + "MessagePack.Annotations.dll", + "MessagePack.dll", + "Nerdbank.Streams.dll", + "WinUI3Apps\\SharpCompress.dll", "ColorCode.Core.dll", "ColorCode.UWP.dll", "UnitsNet.dll" diff --git a/.pipelines/ESRPSigning_vcm.json b/.pipelines/ESRPSigning_vcm.json index bcf7b1fb60..e9f2309cc4 100644 --- a/.pipelines/ESRPSigning_vcm.json +++ b/.pipelines/ESRPSigning_vcm.json @@ -4,7 +4,7 @@ "SignBatches": [ { "MatchedPath": [ - "modules\\VideoConference\\PowerToys.VideoConferenceProxyFilter_x86.dll" + "PowerToys.VideoConferenceProxyFilter_x86.dll" ], "SigningInfo": { "Operations": [ diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index 9fb7023624..5b187423ad 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -210,6 +210,29 @@ steps: clean: false maximumCpuCount: true +# Check if deps.json files don't reference different dll versions. +- task: PowerShell@2 + displayName: Audit deps.json files for all applications + inputs: + filePath: '$(build.sourcesdirectory)\.pipelines\verifyDepsJsonLibraryVersions.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)' + pwsh: true + +# Check if asset files on the main application paths are playing nice and avoiding basic conflicts. +- task: PowerShell@2 + displayName: Audit base applications path asset conflicts + inputs: + filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)' + pwsh: true + +- task: PowerShell@2 + displayName: Audit WinAppSDK applications path asset conflicts + inputs: + filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps' + pwsh: true + # directly not doing WinAppDriver testing - task: VSTest@2 displayName: 'MS Tests' diff --git a/.pipelines/installer-steps.yml b/.pipelines/installer-steps.yml index 6ab7e01009..4c28143ef7 100644 --- a/.pipelines/installer-steps.yml +++ b/.pipelines/installer-steps.yml @@ -53,6 +53,14 @@ steps: "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).msi dir $(build.sourcesdirectory)\extractedMsi + # Check if deps.json files don't reference different dll versions. + - task: PowerShell@2 + displayName: Audit deps.json in MSI extracted files + inputs: + filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File' + pwsh: true + # Did we sign all files - task: PowerShell@1 displayName: Verifying entire build is signed and version set diff --git a/.pipelines/release.yml b/.pipelines/release.yml index aa826824f4..a104998068 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -270,22 +270,6 @@ jobs: configuration: $(BuildConfiguration) maximumCpuCount: true - - task: VSBuild@1 - displayName: Publish Measure Tool UI for Packaging - inputs: - solution: 'src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj' - vsVersion: 17.0 - # The arguments should be the same as the ones for Settings; make sure they are. - msbuildArgs: >- - /target:Publish - /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never - /p:VCRTForwarders-IncludeDebugCRT=false - /p:PowerToysRoot=$(Build.SourcesDirectory) - /p:PublishProfile=InstallationPublishProfile.pubxml - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true - - task: VSBuild@1 displayName: Publish File Locksmith UI for Packaging inputs: @@ -302,6 +286,29 @@ jobs: configuration: $(BuildConfiguration) maximumCpuCount: true + # Check if deps.json files don't reference different dll versions. + - task: PowerShell@2 + displayName: Audit deps.json files for all applications + inputs: + filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)' + pwsh: true + + # Check if asset files on the main application paths are playing nice and avoiding basic conflicts. + - task: PowerShell@2 + displayName: Audit base applications path asset conflicts + inputs: + filePath: '.pipelines/verifyPossibleAssetConflicts.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)' + pwsh: true + + - task: PowerShell@2 + displayName: Audit WinAppSDK applications path asset conflicts + inputs: + filePath: '.pipelines/verifyPossibleAssetConflicts.ps1' + arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps' + pwsh: true + #### MAIN SIGNING AREA # reference https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/ESRPSigning.json&version=GBarm64-netcore&_a=contents for winappdriver # https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/CIPolicy.xml&version=GBarm64-netcore&_a=contents diff --git a/.pipelines/verifyDepsJsonLibraryVersions.ps1 b/.pipelines/verifyDepsJsonLibraryVersions.ps1 new file mode 100644 index 0000000000..5dc941fa91 --- /dev/null +++ b/.pipelines/verifyDepsJsonLibraryVersions.ps1 @@ -0,0 +1,82 @@ +[CmdletBinding()] +Param( + [Parameter(Mandatory = $True, Position = 1)] + [string]$targetDir +) + +# This script will check every deps.json file in the target directory to see if for each dll mentioned, +#all the deps.json files that mention it will mention the same version. +# The main goal is to catch when different versions for the same module might be copied to the same directory +#at build time and might create flaky builds that get the wrong version of the dll sometimes. + +# A dictionary of dictionaries of lists to save which files reference each version of each dll. +# Logic is DllName > fileVersion > list with deps.json files that reference it. +# If for a specific dll there's more than one referenced file version, we have build collisions. +$referencedFileVersionsPerDll = @{} +$totalFailures = 0 + +Get-ChildItem $targetDir -Recurse -Filter *.deps.json | ForEach-Object { + $depsJsonFullFileName = $_.FullName + $depsJsonFileName = $_.Name + $depsJson = Get-Content $depsJsonFullFileName | ConvertFrom-Json + + # We're doing a breadth first search to look for every runtime object. + $iterateThroughEveryField = New-Object System.Collections.Generic.Queue[System.Object] + $iterateThroughEveryField.Enqueue($depsJson) + + while($iterateThroughEveryField.Count -gt 0) + { + $currentObject = $iterateThroughEveryField.Dequeue(); + $currentObject.PSObject.Properties | ForEach-Object { + if($_.Name -ne 'SyncRoot') { + # Skip SyncRoot to avoid looping in array objects. + # Care only about objects, not value types. + $iterateThroughEveryField.Enqueue($_.Value) + if($_.Name -eq 'runtime') + { + # Cycle through each dll. + $_.Value.PSObject.Properties | ForEach-Object { + if($_.Name.EndsWith('.dll')) { + $dllName = Split-Path $_.Name -leaf + if([bool]($_.Value.PSObject.Properties.name -match 'fileVersion')) { + $dllFileVersion = $_.Value.fileVersion + + # 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] } + } elseif(-Not $referencedFileVersionsPerDll[$dllName].ContainsKey($dllFileVersion)) { + $referencedFileVersionsPerDll[$dllName][$dllFileVersion] = New-Object System.Collections.Generic.List[System.String] + } + $referencedFileVersionsPerDll[$dllName][$dllFileVersion].Add($depsJsonFileName) + } + } + } + } + } + } + } +} + +# Report on the files that are referenced for more than one version. +$referencedFileVersionsPerDll.keys | ForEach-Object { + if($referencedFileVersionsPerDll[$_].Count -gt 1) { + $dllName = $_ + Write-Host $dllName + $referencedFileVersionsPerDll[$dllName].keys | ForEach-Object { + Write-Host "`t" $_ + $referencedFileVersionsPerDll[$dllName][$_] | ForEach-Object { + Write-Host "`t`t" $_ + } + } + $totalFailures++; + } +} + +if ($totalFailures -gt 0) { + Write-Host -ForegroundColor Red "Detected " $totalFailures " libraries that are mentioned with different version across the dependencies.`r`n" + exit 1 +} + +Write-Host -ForegroundColor Green "All " $referencedFileVersionsPerDll.keys.Count " libraries are mentioned with the same version across the dependencies.`r`n" +exit 0 + diff --git a/.pipelines/verifyPossibleAssetConflicts.ps1 b/.pipelines/verifyPossibleAssetConflicts.ps1 new file mode 100644 index 0000000000..8ded37bef4 --- /dev/null +++ b/.pipelines/verifyPossibleAssetConflicts.ps1 @@ -0,0 +1,52 @@ +[CmdletBinding()] +Param( + [Parameter(Mandatory = $True, Position = 1)] + [string]$targetDir +) + +# This script runs some simple checks to avoid conflicts between assets from different applications during build time. +$totalFailures = 0 + +# Verify if the Assets folder contains only sub-folders. +# The purpose is to avoid applications having assets files that might conflict with other applications. +# Applications should be setting their own directory for assets. + +$targetAssetsDir = $targetDir + "/Assets" + +$nonDirectoryAssetsItems = Get-ChildItem $targetAssetsDir -Attributes !Directory +$directoryAssetsItems = Get-ChildItem $targetAssetsDir -Attributes Directory + +if ($directoryAssetsItems.Count -le 0) { + Write-Host -ForegroundColor Red "No directories detected in " $nonDirectoryAssetsItems ". Are you sure this is the right path?`r`n" + $totalFailures++; +} elseif ($nonDirectoryAssetsItems.Count -gt 0) { + Write-Host -ForegroundColor Red "Detected " $nonDirectoryAssetsItems " files in " $targetAssetsDir "`r`n" + $totalFailures++; +} else { + Write-Host -ForegroundColor Green "Only directories detected in " $targetAssetsDir "`r`n" +} + +# Make sure there's no resources.pri file. Each application should use a different name for their own resources file path. +$resourcesPriFiles = Get-ChildItem $targetDir -Filter resources.pri +if ($resourcesPriFiles.Count -gt 0) { + Write-Host -ForegroundColor Red "Detected a resources.pri file in " $targetDir "`r`n" + $totalFailures++; +} else { + Write-Host -ForegroundColor Green "No resources.pri file detected in " $targetDir "`r`n" +} + +# Each application should have their XAML files in their own paths to avoid these conflicts. +$resourcesPriFiles = Get-ChildItem $targetDir -Filter *.xbf +if ($resourcesPriFiles.Count -gt 0) { + Write-Host -ForegroundColor Red "Detected a .xbf file in " $targetDir "`r`n" + $totalFailures++; +} else { + Write-Host -ForegroundColor Green "No .xbf files detected in " $targetDir "`r`n" +} + +if ($totalFailures -gt 0) { + Write-Host -ForegroundColor Red "Found some errors when verifying " $targetDir "`r`n" + exit 1 +} + +exit 0 diff --git a/Cpp.Build.props b/Cpp.Build.props index 16a54b0e29..2da75a8587 100644 --- a/Cpp.Build.props +++ b/Cpp.Build.props @@ -96,14 +96,14 @@ - 10.0.19041.0 - 10.0.19041.0 + 10.0.20348.0 + 10.0.20348.0 + 10.0.19041.0 v143 - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ Unicode true diff --git a/Directory.Packages.props b/Directory.Packages.props index 6734a7f99a..f51c9b46ac 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + @@ -31,7 +31,8 @@ - + + @@ -59,7 +60,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index 119e359b25..86a4ff47d9 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -286,7 +286,7 @@ SOFTWARE. - CommunityToolkit.WinUI.UI 7.1.2 - CommunityToolkit.WinUI.UI.Animations 7.1.2 - CommunityToolkit.WinUI.UI.Controls 7.1.2 -- ControlzEx 5.0.1 +- ControlzEx 6.0.0 - HelixToolkit 2.20.2 - HelixToolkit.Core.Wpf 2.20.2 - hyjiacan.pinyin4net 4.1.1 @@ -306,7 +306,7 @@ SOFTWARE. - Microsoft.Web.WebView2 1.0.1722.45 - Microsoft.Windows.Compatibility 7.0.3 - Microsoft.Windows.CsWin32 0.2.46-beta -- Microsoft.Windows.CsWinRT 2.0.2 +- Microsoft.Windows.CsWinRT 2.0.3 - Microsoft.Windows.SDK.BuildTools 10.0.22621.755 - Microsoft.Windows.SDK.Contracts 10.0.19041.1 - Microsoft.WindowsAppSDK 1.3.230502000 @@ -332,7 +332,7 @@ SOFTWARE. - System.Management 7.0.2 - System.Reactive 6.0.0-preview.9 - System.Runtime.Caching 7.0.0 -- System.ServiceProcess.ServiceController 7.0.0 +- System.ServiceProcess.ServiceController 7.0.1 - UnicodeInformation 2.6.0 - UnitsNet 4.145.0 - Vanara.PInvoke.Shell32 3.4.11 diff --git a/installer/PowerToysSetup/AlwaysOnTop.wxs b/installer/PowerToysSetup/AlwaysOnTop.wxs deleted file mode 100644 index f98f84d987..0000000000 --- a/installer/PowerToysSetup/AlwaysOnTop.wxs +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/Awake.wxs b/installer/PowerToysSetup/Awake.wxs index 7228069434..a8f5536ff4 100644 --- a/installer/PowerToysSetup/Awake.wxs +++ b/installer/PowerToysSetup/Awake.wxs @@ -4,29 +4,26 @@ - - - + - - - + + + + - - + - + - diff --git a/installer/PowerToysSetup/BaseApplications.wxs b/installer/PowerToysSetup/BaseApplications.wxs new file mode 100644 index 0000000000..134a3ee89a --- /dev/null +++ b/installer/PowerToysSetup/BaseApplications.wxs @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + diff --git a/installer/PowerToysSetup/ColorPicker.wxs b/installer/PowerToysSetup/ColorPicker.wxs index 088c94e19e..0c744a7b26 100644 --- a/installer/PowerToysSetup/ColorPicker.wxs +++ b/installer/PowerToysSetup/ColorPicker.wxs @@ -4,30 +4,26 @@ - - - - + + - - - + + + - - + - + - + - - + diff --git a/installer/PowerToysSetup/Core.wxs b/installer/PowerToysSetup/Core.wxs index 330ff1cd76..1a72d82c10 100644 --- a/installer/PowerToysSetup/Core.wxs +++ b/installer/PowerToysSetup/Core.wxs @@ -4,12 +4,6 @@ - - - - - - @@ -38,24 +32,6 @@ - - - - - - - - - - - - - - - - - - @@ -87,32 +63,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - INSTALLDESKTOPSHORTCUT @@ -139,25 +89,18 @@ - - - - + + + - - - - - - diff --git a/installer/PowerToysSetup/FancyZones.wxs b/installer/PowerToysSetup/FancyZones.wxs deleted file mode 100644 index 1a29f8df40..0000000000 --- a/installer/PowerToysSetup/FancyZones.wxs +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/FileExplorerPreview.wxs b/installer/PowerToysSetup/FileExplorerPreview.wxs index e9a5b291d6..0a92d94c3e 100644 --- a/installer/PowerToysSetup/FileExplorerPreview.wxs +++ b/installer/PowerToysSetup/FileExplorerPreview.wxs @@ -4,15 +4,22 @@ - - + + - + - + + + + + + + + - + @@ -21,11 +28,11 @@ - + - + diff --git a/installer/PowerToysSetup/FileLocksmith.wxs b/installer/PowerToysSetup/FileLocksmith.wxs index f2417ed0f0..085e60eaa7 100644 --- a/installer/PowerToysSetup/FileLocksmith.wxs +++ b/installer/PowerToysSetup/FileLocksmith.wxs @@ -4,21 +4,22 @@ - - - + - + + + + - + - + @@ -30,32 +31,14 @@ - - - - - - - - - - - - - - - + - - - - diff --git a/installer/PowerToysSetup/Hosts.wxs b/installer/PowerToysSetup/Hosts.wxs index 5a63b632f3..cb86aa8e11 100644 --- a/installer/PowerToysSetup/Hosts.wxs +++ b/installer/PowerToysSetup/Hosts.wxs @@ -4,42 +4,25 @@ - - - + - - - + + - - - - - - - - - - - + - - - - diff --git a/installer/PowerToysSetup/ImageResizer.wxs b/installer/PowerToysSetup/ImageResizer.wxs index 5534e838c8..20ded78434 100644 --- a/installer/PowerToysSetup/ImageResizer.wxs +++ b/installer/PowerToysSetup/ImageResizer.wxs @@ -4,19 +4,21 @@ - - - + - + + + + + - + - + @@ -81,17 +83,11 @@ - - - - - - + - diff --git a/installer/PowerToysSetup/KeyboardManager.wxs b/installer/PowerToysSetup/KeyboardManager.wxs index 925588c41e..00e895c1ec 100644 --- a/installer/PowerToysSetup/KeyboardManager.wxs +++ b/installer/PowerToysSetup/KeyboardManager.wxs @@ -5,46 +5,39 @@ - - - - - - - - + + + - + - + - + - + - + - - diff --git a/installer/PowerToysSetup/MeasureTool.wxs b/installer/PowerToysSetup/MeasureTool.wxs deleted file mode 100644 index 879a3246ac..0000000000 --- a/installer/PowerToysSetup/MeasureTool.wxs +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/MouseUtils.wxs b/installer/PowerToysSetup/MouseUtils.wxs deleted file mode 100644 index 933b6b115f..0000000000 --- a/installer/PowerToysSetup/MouseUtils.wxs +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/MouseWithoutBorders.wxs b/installer/PowerToysSetup/MouseWithoutBorders.wxs index 930f500f3f..8a5efa1f8d 100644 --- a/installer/PowerToysSetup/MouseWithoutBorders.wxs +++ b/installer/PowerToysSetup/MouseWithoutBorders.wxs @@ -5,28 +5,14 @@ - - - - - - - - - - - - - - - + - + diff --git a/installer/PowerToysSetup/PastePlain.wxs b/installer/PowerToysSetup/PastePlain.wxs deleted file mode 100644 index a0a92e4603..0000000000 --- a/installer/PowerToysSetup/PastePlain.wxs +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/Peek.wxs b/installer/PowerToysSetup/Peek.wxs index d086c3ee67..f87794e945 100644 --- a/installer/PowerToysSetup/Peek.wxs +++ b/installer/PowerToysSetup/Peek.wxs @@ -4,42 +4,25 @@ - - - + - - - + + - - - - - - - - - - - + - - - - diff --git a/installer/PowerToysSetup/PowerAccent.wxs b/installer/PowerToysSetup/PowerAccent.wxs deleted file mode 100644 index 98d78ca856..0000000000 --- a/installer/PowerToysSetup/PowerAccent.wxs +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/PowerRename.wxs b/installer/PowerToysSetup/PowerRename.wxs index 5b5f48f1e7..1e722d9334 100644 --- a/installer/PowerToysSetup/PowerRename.wxs +++ b/installer/PowerToysSetup/PowerRename.wxs @@ -4,21 +4,22 @@ - - - + - + + + + - + - + @@ -31,32 +32,14 @@ - - - - - - - - - - - - - - - + - - - - diff --git a/installer/PowerToysSetup/PowerToysInstaller.wixproj b/installer/PowerToysSetup/PowerToysInstaller.wixproj index a95128125e..e1cbe42d5f 100644 --- a/installer/PowerToysSetup/PowerToysInstaller.wixproj +++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj @@ -4,14 +4,14 @@ - Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\modules\FileExplorerPreview\monacoSRC + Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC IF NOT DEFINED IsPipeline ( call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.19041.0 -SET PTRoot=..\..\..\..\.. +SET PTRoot=$(SolutionDir)\.. call "..\..\..\publish.cmd" x64 ) call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" @@ -19,10 +19,10 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil - Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\modules\FileExplorerPreview\monacoSRC + Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC IF NOT DEFINED IsPipeline ( call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -SET PTRoot=..\..\..\..\.. +SET PTRoot=$(SolutionDir)\.. call "..\..\..\publish.cmd" arm64 ) call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" @@ -31,21 +31,17 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil Always - call move /Y ..\..\..\AlwaysOnTop.wxs.bk ..\..\..\AlwaysOnTop.wxs call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs + call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs - call move /Y ..\..\..\FancyZones.wxs.bk ..\..\..\FancyZones.wxs call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs - call move /Y ..\..\..\MeasureTool.wxs.bk ..\..\..\MeasureTool.wxs - call move /Y ..\..\..\MouseUtils.wxs.bk ..\..\..\MouseUtils.wxs call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs - call move /Y ..\..\..\PowerAccent.wxs.bk ..\..\..\PowerAccent.wxs call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs @@ -53,11 +49,10 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs - call move /Y ..\..\..\TextExtractor.wxs.bk ..\..\..\TextExtractor.wxs call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs - call move /Y ..\..\..\..\PowerToysSetupCustomActions\DepsFilesLists.h.bk ..\..\..\..\PowerToysSetupCustomActions\DepsFilesLists.h + call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs @@ -106,29 +101,24 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil - + - - - - - - + @@ -189,7 +179,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil --> - - - + + - - - - - - @@ -141,12 +135,6 @@ - - - - - - NOT Installed and CREATESCHEDULEDTASK = 1 @@ -156,15 +144,6 @@ NOT Installed - - NOT Installed - - - NOT Installed - - - NOT Installed - @@ -183,16 +162,6 @@ Installed AND (REMOVE="ALL") - - Installed AND (REMOVE="ALL") - - - - - - Installed AND (REMOVE="ALL") - - Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") @@ -266,52 +235,6 @@ DllEntry="CreateScheduledTaskCA" /> - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/RegistryPreview.wxs b/installer/PowerToysSetup/RegistryPreview.wxs index 74804f6c6e..f7bd3948d4 100644 --- a/installer/PowerToysSetup/RegistryPreview.wxs +++ b/installer/PowerToysSetup/RegistryPreview.wxs @@ -4,44 +4,26 @@ - - - - + - - - + + - - - - - - - - - - - + - - - - diff --git a/installer/PowerToysSetup/Resources.wxs b/installer/PowerToysSetup/Resources.wxs index 2724e73992..9627af3724 100644 --- a/installer/PowerToysSetup/Resources.wxs +++ b/installer/PowerToysSetup/Resources.wxs @@ -11,7 +11,7 @@ - + @@ -143,75 +143,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -408,7 +408,7 @@ - + @@ -459,11 +459,7 @@ - - - - - + diff --git a/installer/PowerToysSetup/Run.wxs b/installer/PowerToysSetup/Run.wxs index 6cf803e36e..55dac846f2 100644 --- a/installer/PowerToysSetup/Run.wxs +++ b/installer/PowerToysSetup/Run.wxs @@ -4,118 +4,179 @@ - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -335,11 +396,10 @@ - + - diff --git a/installer/PowerToysSetup/Settings.wxs b/installer/PowerToysSetup/Settings.wxs index 698575cbcf..8306aadf16 100644 --- a/installer/PowerToysSetup/Settings.wxs +++ b/installer/PowerToysSetup/Settings.wxs @@ -4,27 +4,27 @@ - - - - + - + - + - + - - - + + + + + + + - @@ -45,30 +45,17 @@ - - - - - - - - - - + - - - - diff --git a/installer/PowerToysSetup/ShortcutGuide.wxs b/installer/PowerToysSetup/ShortcutGuide.wxs index 2053ffae34..729a805861 100644 --- a/installer/PowerToysSetup/ShortcutGuide.wxs +++ b/installer/PowerToysSetup/ShortcutGuide.wxs @@ -5,49 +5,26 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - + - - - - - diff --git a/installer/PowerToysSetup/TextExtractor.wxs b/installer/PowerToysSetup/TextExtractor.wxs deleted file mode 100644 index 3afbb2a5e1..0000000000 --- a/installer/PowerToysSetup/TextExtractor.wxs +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/PowerToysSetup/VideoConference.wxs b/installer/PowerToysSetup/VideoConference.wxs index c2b6915e5c..04bdb1e506 100644 --- a/installer/PowerToysSetup/VideoConference.wxs +++ b/installer/PowerToysSetup/VideoConference.wxs @@ -5,56 +5,51 @@ - + WINDOWSBUILDNUMBER >= 19041 - - - - - - - - + - + + + + WINDOWSBUILDNUMBER >= 19041 - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + - diff --git a/installer/PowerToysSetup/WinAppSDK.wxs b/installer/PowerToysSetup/WinAppSDK.wxs index 30eb5bd63a..e81b547231 100644 --- a/installer/PowerToysSetup/WinAppSDK.wxs +++ b/installer/PowerToysSetup/WinAppSDK.wxs @@ -4,141 +4,140 @@ - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -315,84 +314,23 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + @@ -508,17 +446,13 @@ - - - - - - - + - + + + - + diff --git a/installer/PowerToysSetup/WinUI3Applications.wxs b/installer/PowerToysSetup/WinUI3Applications.wxs new file mode 100644 index 0000000000..742f3dcf80 --- /dev/null +++ b/installer/PowerToysSetup/WinUI3Applications.wxs @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + diff --git a/installer/PowerToysSetup/generateAllFileComponents.ps1 b/installer/PowerToysSetup/generateAllFileComponents.ps1 index 108d725f12..6542bc45c3 100644 --- a/installer/PowerToysSetup/generateAllFileComponents.ps1 +++ b/installer/PowerToysSetup/generateAllFileComponents.ps1 @@ -16,219 +16,168 @@ if ($installscopeperuser -eq "true") { $registryroot = "HKLM" } -#AlwaysOnTop -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AlwaysOnTopFiles -wxsFilePath $PSScriptRoot\AlwaysOnTop.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\AlwaysOnTop""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AlwaysOnTopFiles"" -wxsFilePath $PSScriptRoot\AlwaysOnTop.wxs -regroot $registryroot" +#BaseApplications +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release""" +Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""BaseApplicationsFiles"" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot" + +#WinUI3Applications +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps""" +Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinUI3ApplicationsFiles"" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot" #AwakeFiles -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\Awake\PowerToys.Awake.deps.json"" -fileListName AwakeFiles -wxsFilePath $PSScriptRoot\Awake.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\Awake\Images""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AwakeFiles"" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Awake""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AwakeImagesFiles"" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot" #ColorPicker -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\ColorPicker\PowerToys.ColorPickerUI.deps.json"" -fileListName ColorPickerFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ColorPickerResourcesFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\ColorPicker\Resources""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerResourcesFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot" - -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\ColorPicker\PowerToys.ColorPickerUI.deps.json"" -fileListName ColorPickerFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot" - -#FancyZones -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\FancyZones\PowerToys.FancyZonesEditor.deps.json"" -fileListName FancyZonesFiles -wxsFilePath $PSScriptRoot\FancyZones.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FancyZonesFiles"" -wxsFilePath $PSScriptRoot\FancyZones.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker""" +Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerAssetsFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot" #FileExplorerAdd-ons -#TODO: There are multiple .deps.json files, make sure it works as expected -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\FileExplorerPreview\PowerToys.SvgThumbnailProvider.deps.json"" -fileListName PowerPreviewFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\FileExplorerPreview\customLanguages""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerPreviewFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages""" +Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerMonacoAssetsFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerCustomLanguagesFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot" #FileLocksmith -#TODO: There are multiple .deps.json files, make sure it works as expected -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\FileLocksmith\PowerToys.FileLocksmithUI.deps.json"" -fileListName FileLocksmithFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -isWinAppSdkProj 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\FileLocksmith\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FileLocksmithFiles"" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FileLocksmithAssetsFiles"" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot" #Hosts -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\Hosts\PowerToys.Hosts.deps.json"" -fileListName HostsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -isWinAppSdkProj 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\Hosts\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HostsFiles"" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HostsAssetsFiles"" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot" #ImageResizer -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\ImageResizer\PowerToys.ImageResizer.deps.json"" -fileListName ImageResizerFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\ImageResizer\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerAssetsFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot" -#MouseUtils -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MouseUtilsFiles -wxsFilePath $PSScriptRoot\MouseUtils.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\MouseUtils\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MouseUtilsFiles"" -wxsFilePath $PSScriptRoot\MouseUtils.wxs -regroot $registryroot" -#MouseJumpUI -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\MouseUtils\MouseJumpUI\PowerToys.MouseJumpUI.deps.json"" -fileListName MouseJumpUIFiles -wxsFilePath $PSScriptRoot\MouseUtils.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MouseJumpUIFiles"" -wxsFilePath $PSScriptRoot\MouseUtils.wxs -regroot $registryroot" - -#MouseWithoutBorders -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\MouseWithoutBorders\PowerToys.MouseWithoutBorders.deps.json;$PSScriptRoot..\..\..\$platform\Release\modules\MouseWithoutBorders\PowerToys.MouseWithoutBordersHelper.deps.json;$PSScriptRoot..\..\..\$platform\Release\modules\MouseWithoutBorders\PowerToys.MouseWithoutBordersService.deps.json"" -fileListName MouseWithoutBordersFiles -wxsFilePath $PSScriptRoot\MouseWithoutBorders.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MouseWithoutBordersFiles"" -wxsFilePath $PSScriptRoot\MouseWithoutBorders.wxs -regroot $registryroot" - -#MeasureTool -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\MeasureTool\PowerToys.MeasureToolUI.deps.json"" -fileListName MeasureToolFiles -wxsFilePath $PSScriptRoot\MeasureTool.wxs -isWinAppSdkProj 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MeasureToolFiles"" -wxsFilePath $PSScriptRoot\MeasureTool.wxs -regroot $registryroot" - #Peek -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\Peek\PowerToys.Peek.UI.deps.json"" -fileListName PeekFiles -wxsFilePath $PSScriptRoot\Peek.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\Peek\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekAssetsFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot" -#PowerAccent -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerAccent\PowerToys.PowerAccent.deps.json"" -fileListName PowerAccentFiles -wxsFilePath $PSScriptRoot\PowerAccent.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerAccentFiles"" -wxsFilePath $PSScriptRoot\PowerAccent.wxs -regroot $registryroot" - #PowerRename -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerRename\"" -isWinAppSdkProj 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerRename\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerRenameFiles"" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerRenameAssetsFiles"" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot" #RegistryPreview -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\RegistryPreview\PowerToys.RegistryPreview.deps.json"" -fileListName RegistryPreviewFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\RegistryPreview\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryPreviewFiles"" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryPreviewAssetsFiles"" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot" #Run -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\PowerToys.PowerLauncher.deps.json"" -fileListName launcherFiles -wxsFilePath $PSScriptRoot\Run.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Images""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""launcherFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""launcherImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ## Plugins ###Calculator -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json"" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Calculator\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json"" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Folder -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Folder\Microsoft.Plugin.Folder.deps.json"" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Folder\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json"" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Program -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Program\Microsoft.Plugin.Program.deps.json"" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Program\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json"" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Shell -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Shell\Microsoft.Plugin.Shell.deps.json"" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Shell\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json"" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Indexer -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Indexer\Microsoft.Plugin.Indexer.deps.json"" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Indexer\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json"" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###UnitConverter -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json"" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\UnitConverter\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json"" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###WebSearch -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json"" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WebSearch\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json"" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###History -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json"" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\History\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json"" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Uri -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Uri\Microsoft.Plugin.Uri.deps.json"" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Uri\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json"" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###VSCodeWorkspaces -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json"" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\VSCodeWorkspaces\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json"" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###WindowWalker -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json"" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowWalker\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json"" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###OneNote -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json"" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\OneNote\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json"" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Registry -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json"" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Registry\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json"" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###Service -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json"" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\Service\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json"" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###System -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json"" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\System\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json"" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###TimeDate -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json"" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\TimeDate\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json"" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###WindowsSettings -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json"" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsSettings\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json"" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###WindowsTerminal -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json"" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsTerminal\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json"" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###PowerToys -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\PowerToys\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ###ValueGenerator -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json"" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\ValueGenerator\Images""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json"" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot" ## Plugins #ShortcutGuide -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\ShortcutGuide\ShortcutGuide\svgs\""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShortcutGuideSvgFiles"" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot" -#TextExtractor -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\PowerOCR\PowerToys.PowerOCR.deps.json"" -fileListName TextExtractorFiles -wxsFilePath $PSScriptRoot\TextExtractor.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TextExtractorFiles"" -wxsFilePath $PSScriptRoot\TextExtractor.wxs -regroot $registryroot" - #Settings -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\Settings\PowerToys.Settings.deps.json"" -fileListName SettingsV2Files -wxsFilePath $PSScriptRoot\Settings.wxs" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\Modules\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\Modules\OOBE\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Settings\Assets\FluentIcons\""" -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2Files"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\""" +Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\FluentIcons\""" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsFluentIconsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot" - -#WinAppSdk -Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinAppSDKFiles"" -wxsFilePath $PSScriptRoot\WinAppSDK.wxs -regroot $registryroot" diff --git a/installer/PowerToysSetup/generateFileList.ps1 b/installer/PowerToysSetup/generateFileList.ps1 index 8b95ce3993..9d9fe36c10 100644 --- a/installer/PowerToysSetup/generateFileList.ps1 +++ b/installer/PowerToysSetup/generateFileList.ps1 @@ -14,43 +14,14 @@ Param( # launcher plugins are being loaded into launcher process, # so there are some additional dependencies to skip [Parameter(Mandatory = $False, Position = 5)] - [bool]$isLauncherPlugin, - # Skip winAppSDK dlls as those are hard-linked - [Parameter(Mandatory = $False, Position = 6)] - [bool]$isWinAppSdkProj + [bool]$isLauncherPlugin ) $fileWxs = Get-Content $wxsFilePath; -#Skip PowerToysInterop files -$coreWxs = Get-Content $PSScriptRoot/"Core.wxs" -$coreWxs | ForEach-Object { - if ($_ -match "(") { - [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList', - Justification = 'variable is used in another scope')] +$fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe") - $interopFilesList = $matches[2] -split ';' - return - } -} - -#Skip WinAppSdk files -if ($isWinAppSdkProj -eq $True) { - $winAppSDKWxs = Get-Content $PSScriptRoot/"WinAppSDK.wxs" - $winAppSDKWxs | ForEach-Object { - if ($_ -match "(") { - [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList', - Justification = 'variable is used in another scope')] - - $winAppSDKfilesList = $matches[2] -split ';' - return - } - } -} - -$fileExclusionList = @("*Test*", "*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe") + $interopFilesList + $winAppSDKfilesList - -$fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*png", "*gif", "*ico", "*cur", "*svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "resources.pri") +$fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "*.pri") $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll") diff --git a/installer/PowerToysSetup/generateMonacoWxs.ps1 b/installer/PowerToysSetup/generateMonacoWxs.ps1 index 389491f5c1..94536618da 100644 --- a/installer/PowerToysSetup/generateMonacoWxs.ps1 +++ b/installer/PowerToysSetup/generateMonacoWxs.ps1 @@ -43,7 +43,7 @@ $fileWxs | ForEach-Object { $removeFolderEntries = @" -`r`n +`r`n `r`n diff --git a/installer/PowerToysSetup/publish.cmd b/installer/PowerToysSetup/publish.cmd index ec3658f294..1baf824d1b 100644 --- a/installer/PowerToysSetup/publish.cmd +++ b/installer/PowerToysSetup/publish.cmd @@ -19,8 +19,4 @@ msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csp msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -msbuild !PTRoot!\src\modules\MeasureTool\MeasureToolUI\MeasureToolUI.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml - msbuild !PTRoot!\src\modules\FileLocksmith\FileLocksmithUI\FileLocksmithUI.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml - -msbuild !PTRoot!\src\modules\registrypreview\RegistryPreviewUI\RegistryPreviewUI.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp index 3c623049b7..5aab9e41d6 100644 --- a/installer/PowerToysSetupCustomActions/CustomAction.cpp +++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp @@ -16,8 +16,6 @@ #include #include -#include "DepsFilesLists.h" - using namespace std; HINSTANCE DLL_HANDLE = nullptr; @@ -1076,359 +1074,6 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall) return WcaFinalize(er); } -const std::wstring WinAppSDKConsumers[] = -{ - L"Settings", - L"modules\\PowerRename", - L"modules\\MeasureTool", - L"modules\\FileLocksmith", - L"modules\\Hosts", - L"modules\\RegistryPreview", - L"modules\\Peek", -}; - -UINT __stdcall CreateWinAppSDKHardlinksCA(MSIHANDLE hInstall) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder, winAppSDKFilesSrcDir; - - hr = WcaInitialize(hInstall, "CreateWinAppSDKHardlinksCA"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = getInstallFolder(hInstall, installationFolder); - ExitOnFailure(hr, "Failed to get installation folder"); - - winAppSDKFilesSrcDir = installationFolder + L"dll\\WinAppSDK\\"; - - for (auto file : winAppSdkFiles) - { - for (auto consumer : WinAppSDKConsumers) - { - std::error_code ec; - std::filesystem::create_hard_link((winAppSDKFilesSrcDir + file).c_str(), (installationFolder + consumer + L"\\" + file).c_str(), ec); - - if (ec.value() != S_OK) - { - std::wstring errorMessage{ L"Error creating hard link for: " }; - errorMessage += file; - errorMessage += L", error code: " + std::to_wstring(ec.value()); - Logger::error(errorMessage); - } - } - } - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -const std::wstring PTInteropConsumers[] = -{ - L"modules\\ColorPicker", - L"modules\\PowerOCR", - L"modules\\launcher", - L"modules\\FancyZones", - L"modules\\ImageResizer", - L"Settings", - L"modules\\Awake", - L"modules\\MeasureTool", - L"modules\\PowerAccent", - L"modules\\FileLocksmith", - L"modules\\Hosts", - L"modules\\Peek", - L"modules\\FileExplorerPreview", - L"modules\\MouseWithoutBorders", - L"modules\\MouseUtils\\MouseJumpUI", - L"modules\\RegistryPreview", -}; - -UINT __stdcall CreatePTInteropHardlinksCA(MSIHANDLE hInstall) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder, interopFilesSrcDir; - - hr = WcaInitialize(hInstall, "CreatePTInteropHardlinksCA"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = getInstallFolder(hInstall, installationFolder); - ExitOnFailure(hr, "Failed to get installation folder"); - - interopFilesSrcDir = installationFolder + L"dll\\Interop\\"; - - for (auto file : powerToysInteropFiles) - { - for (auto consumer : PTInteropConsumers) - { - std::error_code ec; - std::filesystem::create_hard_link((interopFilesSrcDir + file).c_str(), (installationFolder + consumer + L"\\" + file).c_str(), ec); - - if (ec.value() != S_OK) - { - std::wstring errorMessage{ L"Error creating hard link for: " }; - errorMessage += file; - errorMessage += L", error code: " + std::to_wstring(ec.value()); - Logger::error(errorMessage); - } - } - } - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -UINT __stdcall CreateDotnetRuntimeHardlinksCA(MSIHANDLE hInstall) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder, dotnetRuntimeFilesSrcDir, colorPickerDir, powerOCRDir, launcherDir, fancyZonesDir, - imageResizerDir, settingsDir, awakeDir, measureToolDir, powerAccentDir, fileExplorerAddOnsDir, hostsDir, fileLocksmithDir, - mouseJumpDir, registryPreviewDir, peekDir, mwbDir; - - hr = WcaInitialize(hInstall, "CreateDotnetRuntimeHardlinksCA"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = getInstallFolder(hInstall, installationFolder); - ExitOnFailure(hr, "Failed to get installation folder"); - - dotnetRuntimeFilesSrcDir = installationFolder + L"dll\\dotnet\\"; - colorPickerDir = installationFolder + L"modules\\ColorPicker\\"; - powerOCRDir = installationFolder + L"modules\\PowerOCR\\"; - launcherDir = installationFolder + L"modules\\launcher\\"; - fancyZonesDir = installationFolder + L"modules\\FancyZones\\"; - imageResizerDir = installationFolder + L"modules\\ImageResizer\\"; - settingsDir = installationFolder + L"Settings\\"; - awakeDir = installationFolder + L"modules\\Awake\\"; - measureToolDir = installationFolder + L"modules\\MeasureTool\\"; - powerAccentDir = installationFolder + L"modules\\PowerAccent\\"; - fileExplorerAddOnsDir = installationFolder + L"modules\\FileExplorerPreview\\"; - hostsDir = installationFolder + L"modules\\Hosts\\"; - fileLocksmithDir = installationFolder + L"modules\\FileLocksmith\\"; - mwbDir = installationFolder + L"modules\\MouseWithoutBorders\\"; - mouseJumpDir = installationFolder + L"modules\\MouseUtils\\MouseJumpUI\\"; - registryPreviewDir = installationFolder + L"modules\\RegistryPreview\\"; - peekDir = installationFolder + L"modules\\Peek\\"; - - for (auto file : dotnetRuntimeFiles) - { - std::error_code ec; - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (colorPickerDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerOCRDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (launcherDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fancyZonesDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (imageResizerDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (settingsDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (awakeDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (measureToolDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerAccentDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fileExplorerAddOnsDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (hostsDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fileLocksmithDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mwbDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mouseJumpDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (registryPreviewDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (peekDir + file).c_str(), ec); - - if (ec.value() != S_OK) - { - std::wstring errorMessage{ L"Error creating hard link for: " }; - errorMessage += file; - errorMessage += L", error code: " + std::to_wstring(ec.value()); - Logger::error(errorMessage); - er = ERROR_INSTALL_FAILURE; - } - } - - for (auto file : dotnetRuntimeWPFFiles) - { - std::error_code ec; - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (awakeDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (colorPickerDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerOCRDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (launcherDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fancyZonesDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (imageResizerDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (powerAccentDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (fileExplorerAddOnsDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (hostsDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mouseJumpDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (registryPreviewDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (peekDir + file).c_str(), ec); - std::filesystem::create_hard_link((dotnetRuntimeFilesSrcDir + file).c_str(), (mwbDir + file).c_str(), ec); - - if (ec.value() != S_OK) - { - std::wstring errorMessage{ L"Error creating hard link for: " }; - errorMessage += file; - errorMessage += L", error code: " + std::to_wstring(ec.value()); - Logger::error(errorMessage); - er = ERROR_INSTALL_FAILURE; - } - } - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -UINT __stdcall DeleteWinAppSDKHardlinksCA(MSIHANDLE hInstall) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder; - - hr = WcaInitialize(hInstall, "DeleteWinAppSDKHardlinksCA"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = getInstallFolder(hInstall, installationFolder); - ExitOnFailure(hr, "Failed to get installation folder"); - - try - { - for (auto file : winAppSdkFiles) - { - for (auto consumer : WinAppSDKConsumers) - { - DeleteFile((installationFolder + consumer + L"\\" + file).c_str()); - } - } - } - catch (std::exception e) - { - std::string errorMessage{ "Exception thrown while trying to delete WAS hardlinks: " }; - errorMessage += e.what(); - Logger::error(errorMessage); - - er = ERROR_INSTALL_FAILURE; - } - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -UINT __stdcall DeletePTInteropHardlinksCA(MSIHANDLE hInstall) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder, interopFilesSrcDir; - - hr = WcaInitialize(hInstall, "DeletePTInteropHardlinksCA"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = getInstallFolder(hInstall, installationFolder); - ExitOnFailure(hr, "Failed to get installation folder"); - - try - { - for (auto file : powerToysInteropFiles) - { - for (auto consumer : PTInteropConsumers) - { - DeleteFile((installationFolder + consumer + L"\\" + file).c_str()); - } - } - } - catch (std::exception e) - { - std::string errorMessage{ "Exception thrown while trying to delete PowerToys Interop and VC Redist hardlinks: " }; - errorMessage += e.what(); - Logger::error(errorMessage); - - er = ERROR_INSTALL_FAILURE; - } - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - -UINT __stdcall DeleteDotnetRuntimeHardlinksCA(MSIHANDLE hInstall) -{ - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - std::wstring installationFolder, colorPickerDir, powerOCRDir, launcherDir, fancyZonesDir, - imageResizerDir, settingsDir, awakeDir, measureToolDir, powerAccentDir, fileExplorerAddOnsDir, - hostsDir, fileLocksmithDir, mouseJumpDir, registryPreviewDir, peekDir, mwbDir; - - hr = WcaInitialize(hInstall, "DeleteDotnetRuntimeHardlinksCA"); - ExitOnFailure(hr, "Failed to initialize"); - - hr = getInstallFolder(hInstall, installationFolder); - ExitOnFailure(hr, "Failed to get installation folder"); - - colorPickerDir = installationFolder + L"modules\\ColorPicker\\"; - powerOCRDir = installationFolder + L"modules\\PowerOCR\\"; - launcherDir = installationFolder + L"modules\\launcher\\"; - fancyZonesDir = installationFolder + L"modules\\FancyZones\\"; - imageResizerDir = installationFolder + L"modules\\ImageResizer\\"; - settingsDir = installationFolder + L"Settings\\"; - awakeDir = installationFolder + L"modules\\Awake\\"; - measureToolDir = installationFolder + L"modules\\MeasureTool\\"; - powerAccentDir = installationFolder + L"modules\\PowerAccent\\"; - fileExplorerAddOnsDir = installationFolder + L"modules\\FileExplorerPreview\\"; - hostsDir = installationFolder + L"modules\\Hosts\\"; - fileLocksmithDir = installationFolder + L"modules\\FileLocksmith\\"; - mwbDir = installationFolder + L"modules\\MouseWithoutBorders\\"; - mouseJumpDir = installationFolder + L"modules\\MouseUtils\\MouseJumpUI\\"; - registryPreviewDir = installationFolder + L"modules\\RegistryPreview\\"; - peekDir = installationFolder + L"modules\\Peek\\"; - - try - { - for (auto file : dotnetRuntimeFiles) - { - DeleteFile((colorPickerDir + file).c_str()); - DeleteFile((powerOCRDir + file).c_str()); - DeleteFile((launcherDir + file).c_str()); - DeleteFile((fancyZonesDir + file).c_str()); - DeleteFile((imageResizerDir + file).c_str()); - DeleteFile((settingsDir + file).c_str()); - DeleteFile((awakeDir + file).c_str()); - DeleteFile((measureToolDir + file).c_str()); - DeleteFile((powerAccentDir + file).c_str()); - DeleteFile((fileExplorerAddOnsDir + file).c_str()); - DeleteFile((hostsDir + file).c_str()); - DeleteFile((fileLocksmithDir + file).c_str()); - DeleteFile((mouseJumpDir + file).c_str()); - DeleteFile((registryPreviewDir + file).c_str()); - DeleteFile((peekDir + file).c_str()); - DeleteFile((mwbDir + file).c_str()); - } - - for (auto file : dotnetRuntimeWPFFiles) - { - DeleteFile((awakeDir + file).c_str()); - DeleteFile((colorPickerDir + file).c_str()); - DeleteFile((powerOCRDir + file).c_str()); - DeleteFile((launcherDir + file).c_str()); - DeleteFile((fancyZonesDir + file).c_str()); - DeleteFile((imageResizerDir + file).c_str()); - DeleteFile((powerAccentDir + file).c_str()); - DeleteFile((fileExplorerAddOnsDir + file).c_str()); - DeleteFile((hostsDir + file).c_str()); - DeleteFile((mouseJumpDir + file).c_str()); - DeleteFile((registryPreviewDir + file).c_str()); - DeleteFile((peekDir + file).c_str()); - DeleteFile((mwbDir + file).c_str()); - } - } - catch (std::exception e) - { - std::string errorMessage{ "Exception thrown while trying to delete dotnet runtime hardlinks: " }; - errorMessage += e.what(); - Logger::error(errorMessage); - - er = ERROR_INSTALL_FAILURE; - } - -LExit: - er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; - return WcaFinalize(er); -} - UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall) { HRESULT hr = S_OK; diff --git a/installer/PowerToysSetupCustomActions/CustomAction.def b/installer/PowerToysSetupCustomActions/CustomAction.def index 2d7397f4da..65b7b1faf2 100644 --- a/installer/PowerToysSetupCustomActions/CustomAction.def +++ b/installer/PowerToysSetupCustomActions/CustomAction.def @@ -4,12 +4,6 @@ EXPORTS CheckGPOCA ApplyModulesRegistryChangeSetsCA CreateScheduledTaskCA - CreateWinAppSDKHardlinksCA - DeleteWinAppSDKHardlinksCA - CreatePTInteropHardlinksCA - DeletePTInteropHardlinksCA - CreateDotnetRuntimeHardlinksCA - DeleteDotnetRuntimeHardlinksCA DetectPrevInstallPathCA RemoveScheduledTasksCA TelemetryLogInstallSuccessCA diff --git a/installer/PowerToysSetupCustomActions/DepsFilesLists.h b/installer/PowerToysSetupCustomActions/DepsFilesLists.h deleted file mode 100644 index b3161476a6..0000000000 --- a/installer/PowerToysSetupCustomActions/DepsFilesLists.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include -#include - -inline const std::vector winAppSdkFiles = { - L"CoreMessagingXP.dll", - L"DWriteCore.dll", - L"DwmSceneI.dll", - L"MRM.dll", - L"Microsoft.DirectManipulation.dll", - L"Microsoft.InputStateManager.dll", - L"Microsoft.Internal.FrameworkUdk.dll", - L"Microsoft.UI.Composition.OSSupport.dll", - L"Microsoft.UI.Input.dll", - L"Microsoft.UI.Windowing.Core.dll", - L"Microsoft.UI.Windowing.dll", - L"Microsoft.UI.Xaml.Controls.dll", - L"Microsoft.UI.Xaml.Controls.pri", - L"Microsoft.UI.Xaml.Internal.dll", - L"Microsoft.UI.Xaml.Phone.dll", - L"Microsoft.Web.WebView2.Core.dll", - L"Microsoft.Windows.AppNotifications.Projection.dll", - L"Microsoft.Windows.ApplicationModel.Resources.dll", - L"Microsoft.WindowsAppRuntime.Bootstrap.dll", - L"Microsoft.Windows.PushNotifications.Projection.dll", - L"Microsoft.Windows.System.Projection.dll", - L"Microsoft.WindowsAppRuntime.Insights.Resource.dll", - L"Microsoft.WindowsAppRuntime.Release.Net.dll", - L"Microsoft.WindowsAppRuntime.dll", - L"Microsoft.ui.xaml.dll", - L"Microsoft.ui.xaml.resources.19h1.dll", - L"Microsoft.ui.xaml.resources.common.dll", - L"PushNotificationsLongRunningTask.ProxyStub.dll", - L"WinUIEdit.dll", - L"WindowsAppRuntime.png", - L"WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll", - L"WindowsAppSdk.AppxDeploymentExtensions.Desktop-EventLog-Instrumentation.dll", - L"dcompi.dll", - L"dwmcorei.dll", - L"marshal.dll", - L"wuceffectsi.dll" -}; - -inline const std::vector powerToysInteropFiles = { - L"concrt140.dll", - L"msvcp140.dll", - L"msvcp140_1.dll", - L"msvcp140_2.dll", - L"msvcp140_atomic_wait.dll", - L"msvcp140_codecvt_ids.dll", - L"PowerToys.Interop.dll", - L"vcamp140.dll", - L"vccorlib140.dll", - L"vcomp140.dll", - L"vcruntime140.dll", - L"vcruntime140_1.dll" -}; - -inline const std::vector dotnetRuntimeFiles = { }; - -inline const std::vector dotnetRuntimeWPFFiles = { }; diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj index 21f0ca114a..ecdccaac57 100644 --- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj +++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj @@ -6,7 +6,6 @@ {32f3882b-f2d6-4586-b5ed-11e39e522bd3} Win32Proj PowerToysSetupCustomActions - 10.0.19041.0 PowerToysSetupCustomActions @@ -49,21 +48,17 @@ call cmd /C "copy ""$(ProjectDir)DepsFilesLists.h"" ""$(ProjectDir)DepsFilesLists.h.bk""" - call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\AlwaysOnTop.wxs"" ""$(ProjectDir)..\PowerToysSetup\AlwaysOnTop.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetup\Awake.wxs.bk"""" + call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Core.wxs"" ""$(ProjectDir)..\PowerToysSetup\Core.wxs.bk"""" - call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FancyZones.wxs"" ""$(ProjectDir)..\PowerToysSetup\FancyZones.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk"""" - call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MeasureTool.wxs"" ""$(ProjectDir)..\PowerToysSetup\MeasureTool.wxs.bk"""" - call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseUtils.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseUtils.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk"""" - call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerAccent.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerAccent.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs.bk"""" @@ -71,11 +66,10 @@ call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Run.wxs"" ""$(ProjectDir)..\PowerToysSetup\Run.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Settings.wxs"" ""$(ProjectDir)..\PowerToysSetup\Settings.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs"" ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs.bk"""" - call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\TextExtractor.wxs"" ""$(ProjectDir)..\PowerToysSetup\TextExtractor.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Tools.wxs"" ""$(ProjectDir)..\PowerToysSetup\Tools.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs"" ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs.bk"""" - call powershell.exe -NonInteractive -executionpolicy Unrestricted -File parseRuntimes.ps1 -runtimedepsjsonpath "$(ProjectDir)..\..\$(Platform)\$(Configuration)\Settings\PowerToys.Settings.deps.json" -wpfdepsjsonpath "$(ProjectDir)..\..\$(Platform)\$(Configuration)\modules\ColorPicker\PowerToys.ColorPickerUI.deps.json" -depsfileslistspath "$(ProjectDir)DepsFilesLists.h" -productwxspath "$(ProjectDir)..\PowerToysSetup\Core.wxs" + call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs.bk"""" if not "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) if "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(PerUser) diff --git a/installer/PowerToysSetupCustomActions/parseRuntimes.ps1 b/installer/PowerToysSetupCustomActions/parseRuntimes.ps1 deleted file mode 100644 index 1ea58c268c..0000000000 --- a/installer/PowerToysSetupCustomActions/parseRuntimes.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory = $True, Position = 1)] - [string]$runtimedepsjsonpath, - [Parameter(Mandatory = $True, Position = 2)] - [string]$wpfdepsjsonpath, - [Parameter(Mandatory = $True, Position = 3)] - [string]$depsfileslistspath, - [Parameter(Mandatory = $True, Position = 4)] - [string]$productwxspath -) - -function Get-RuntimePack ($depsJsonFile, $runtimeName) { - Write-Host "Parsing $runtimeName Runtime" - $runtimePackList = ([array]$depsJsonFile.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object { $_.Name -match "runtimepack.$runtimeName" }; - - if ($runtimePackList.Length -eq 0) { - Write-Host -ForegroundColor Red "$runtimeName has not been found" - exit 1 - } - - # Enumerate through array of custom objects and parse the names of the property values into a HashTable - $runtimePackList | ForEach-Object { - $runtimes += @{"$($_.Name -replace "runtimepack\.(\S+)\.\S+/\S+",'$1')" = $_.Value.PSObject.Properties.Value | ForEach-Object { - $_.PSObject.Properties.Name - } - } - } - Write-Output $runtimes; -} - -function Update-RuntimeHashTable () { - $runtimes = Get-RuntimePack $runtimeFile "Microsoft.NETCore.App.Runtime" - $runtimes = Get-RuntimePack $wpfRuntimeFile "Microsoft.WindowsDesktop.App.Runtime" - - # Find the dlls that exist in both the .NET Runtime and WPF Runtime deps list and filter out of WPF - $runtimeFileComparison = Compare-Object -ReferenceObject $runtimes["Microsoft.NETCore.App.Runtime"] -DifferenceObject $runtimes["Microsoft.WindowsDesktop.App.Runtime"] -IncludeEqual -ExcludeDifferent - - $runtimes["Microsoft.WindowsDesktop.App.Runtime"] = $runtimes["Microsoft.WindowsDesktop.App.Runtime"] | Where-Object { $_ -notin $runtimeFileComparison.InputObject } - - Write-Output $runtimes; -} - -function Update-RuntimeFileList($runtimeToken, $runtimeKey) { - $depsFilesLists -replace "($runtimeToken = )(.*);", "`$1 {`r`n$(($runtimes[$runtimeKey] | ForEach-Object {' L"'+$_+'"'} | Sort-Object) -join ",`r`n") };" -} - -function Update-ProductWxsRuntimeFileList($runtimeToken, $runtimeKey) { - $productWxs -replace "(define $runtimeToken=)(.*)?>", "`$1$($runtimes[$runtimeKey] -join ';')?>" -} - -function Update-DotnetFilesComponentGuid() { - $productWxs -replace "Dlls_DotnetFiles_Component"" Guid=""([{]?[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}[}]?)""", "Dlls_DotnetFiles_Component"" Guid=""$((New-Guid).ToString().ToUpper())""" -} - -# Read the DepsFilesLists.h file -$depsFilesLists = Get-Content $depsfileslistspath; - -# Read Product.wxs file -$productWxs = Get-Content $productwxspath; - -# Read the deps.json file and convert it to a JSON object -$runtimeFile = Get-Content $runtimedepsjsonpath | ConvertFrom-Json; -$wpfRuntimeFile = Get-Content $wpfdepsjsonpath | ConvertFrom-Json; - -$runtimes = @{} - -$runtimes = Update-RuntimeHashTable - -Write-Host "Writing Microsoft.NETCore.App.Runtime files" -$depsFilesLists = Update-RuntimeFileList "dotnetRuntimeFiles" "Microsoft.NETCore.App.Runtime" -$productWxs = Update-ProductWxsRuntimeFileList "DotnetRuntimeFiles" "Microsoft.NETCore.App.Runtime" - -Write-Host "Writing Microsoft.WindowsDesktop.App.Runtime files" -$depsFilesLists = Update-RuntimeFileList "dotnetRuntimeWPFFiles" "Microsoft.WindowsDesktop.App.Runtime" -$productWxs = Update-ProductWxsRuntimeFileList "DotnetRuntimeWPFFiles" "Microsoft.WindowsDesktop.App.Runtime" - -Write-Host "Update DotnetFiles Component GUID" -$productWxs = Update-DotnetFilesComponentGuid - -Write-Host "Updating $depsfileslistspath" -Set-Content -Path $depsfileslistspath -Value $depsFilesLists - -Write-Host "Updating $productwxspath" -Set-Content -Path $productwxspath -Value $productWxs \ No newline at end of file diff --git a/src/common/AllExperiments/AllExperiments.csproj b/src/common/AllExperiments/AllExperiments.csproj index 44b823cbbc..65ca2c95b6 100644 --- a/src/common/AllExperiments/AllExperiments.csproj +++ b/src/common/AllExperiments/AllExperiments.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 enable enable PowerToys.AllExperiments diff --git a/src/common/Common.UI/SettingsDeepLink.cs b/src/common/Common.UI/SettingsDeepLink.cs index 6e883e110c..87cc631047 100644 --- a/src/common/Common.UI/SettingsDeepLink.cs +++ b/src/common/Common.UI/SettingsDeepLink.cs @@ -72,13 +72,24 @@ namespace Common.UI } } - public static void OpenSettings(SettingsWindow window) + public static void OpenSettings(SettingsWindow window, bool mainExecutableIsOnTheParentFolder) { try { var assemblyPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); - var fullPath = Directory.GetParent(assemblyPath).FullName; - Process.Start(new ProcessStartInfo(fullPath + "\\..\\PowerToys.exe") { Arguments = "--open-settings=" + SettingsWindowNameToString(window) }); + var fullPath = new DirectoryInfo(assemblyPath).FullName; + if (mainExecutableIsOnTheParentFolder) + { + // Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application. + fullPath = fullPath + "\\..\\PowerToys.exe"; + } + else + { + // PowerToys.exe is in the same path as the application. + fullPath = fullPath + "\\PowerToys.exe"; + } + + Process.Start(new ProcessStartInfo(fullPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) }); } catch { diff --git a/src/common/FilePreviewCommon/customLanguages/gitignore.js b/src/common/FilePreviewCommon/Assets/Monaco/customLanguages/gitignore.js similarity index 100% rename from src/common/FilePreviewCommon/customLanguages/gitignore.js rename to src/common/FilePreviewCommon/Assets/Monaco/customLanguages/gitignore.js diff --git a/src/common/FilePreviewCommon/customLanguages/reg.js b/src/common/FilePreviewCommon/Assets/Monaco/customLanguages/reg.js similarity index 100% rename from src/common/FilePreviewCommon/customLanguages/reg.js rename to src/common/FilePreviewCommon/Assets/Monaco/customLanguages/reg.js diff --git a/src/common/FilePreviewCommon/generateLanguagesJson.html b/src/common/FilePreviewCommon/Assets/Monaco/generateLanguagesJson.html similarity index 100% rename from src/common/FilePreviewCommon/generateLanguagesJson.html rename to src/common/FilePreviewCommon/Assets/Monaco/generateLanguagesJson.html diff --git a/src/common/FilePreviewCommon/index.html b/src/common/FilePreviewCommon/Assets/Monaco/index.html similarity index 100% rename from src/common/FilePreviewCommon/index.html rename to src/common/FilePreviewCommon/Assets/Monaco/index.html diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/browser/ui/codicons/codicon/codicon.ttf similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/browser/ui/codicons/codicon/codicon.ttf rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/browser/ui/codicons/codicon/codicon.ttf diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.de.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.de.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.de.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.de.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.es.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.es.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.es.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.es.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.fr.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.fr.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.fr.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.fr.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.it.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.it.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.it.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.it.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ja.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ja.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ja.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ja.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ko.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ko.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ko.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ko.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ru.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ru.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ru.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.ru.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-cn.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-cn.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-cn.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-cn.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-tw.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-tw.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-tw.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/common/worker/simpleWorker.nls.zh-tw.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/base/worker/workerMain.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/worker/workerMain.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/base/worker/workerMain.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/base/worker/workerMain.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/abap/abap.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/abap/abap.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/abap/abap.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/abap/abap.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/apex/apex.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/apex/apex.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/apex/apex.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/apex/apex.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/azcli/azcli.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/azcli/azcli.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/azcli/azcli.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/azcli/azcli.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/bat/bat.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/bat/bat.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/bat/bat.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/bat/bat.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/bicep/bicep.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/bicep/bicep.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/bicep/bicep.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/bicep/bicep.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/cameligo/cameligo.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cameligo/cameligo.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/cameligo/cameligo.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cameligo/cameligo.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/clojure/clojure.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/clojure/clojure.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/clojure/clojure.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/clojure/clojure.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/coffee/coffee.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/coffee/coffee.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/coffee/coffee.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/coffee/coffee.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/cpp/cpp.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cpp/cpp.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/cpp/cpp.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cpp/cpp.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/csharp/csharp.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/csharp/csharp.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/csharp/csharp.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/csharp/csharp.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/csp/csp.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/csp/csp.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/csp/csp.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/csp/csp.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/css/css.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/css/css.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/css/css.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/css/css.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/cypher/cypher.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cypher/cypher.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/cypher/cypher.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/cypher/cypher.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/dart/dart.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/dart/dart.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/dart/dart.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/dart/dart.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/dockerfile/dockerfile.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/dockerfile/dockerfile.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/dockerfile/dockerfile.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/dockerfile/dockerfile.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/ecl/ecl.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/ecl/ecl.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/ecl/ecl.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/ecl/ecl.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/elixir/elixir.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/elixir/elixir.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/elixir/elixir.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/elixir/elixir.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/flow9/flow9.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/flow9/flow9.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/flow9/flow9.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/flow9/flow9.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/freemarker2/freemarker2.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/freemarker2/freemarker2.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/freemarker2/freemarker2.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/freemarker2/freemarker2.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/fsharp/fsharp.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/fsharp/fsharp.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/fsharp/fsharp.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/fsharp/fsharp.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/go/go.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/go/go.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/go/go.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/go/go.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/graphql/graphql.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/graphql/graphql.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/graphql/graphql.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/graphql/graphql.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/handlebars/handlebars.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/handlebars/handlebars.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/handlebars/handlebars.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/handlebars/handlebars.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/hcl/hcl.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/hcl/hcl.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/hcl/hcl.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/hcl/hcl.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/html/html.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/html/html.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/html/html.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/html/html.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/ini/ini.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/ini/ini.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/ini/ini.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/ini/ini.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/java/java.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/java/java.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/java/java.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/java/java.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/javascript/javascript.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/javascript/javascript.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/javascript/javascript.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/javascript/javascript.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/julia/julia.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/julia/julia.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/julia/julia.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/julia/julia.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/kotlin/kotlin.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/kotlin/kotlin.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/kotlin/kotlin.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/kotlin/kotlin.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/less/less.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/less/less.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/less/less.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/less/less.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/lexon/lexon.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/lexon/lexon.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/lexon/lexon.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/lexon/lexon.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/liquid/liquid.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/liquid/liquid.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/liquid/liquid.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/liquid/liquid.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/lua/lua.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/lua/lua.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/lua/lua.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/lua/lua.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/m3/m3.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/m3/m3.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/m3/m3.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/m3/m3.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/markdown/markdown.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/markdown/markdown.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/markdown/markdown.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/markdown/markdown.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/mips/mips.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/mips/mips.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/mips/mips.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/mips/mips.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/msdax/msdax.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/msdax/msdax.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/msdax/msdax.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/msdax/msdax.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/mysql/mysql.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/mysql/mysql.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/mysql/mysql.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/mysql/mysql.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/objective-c/objective-c.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/objective-c/objective-c.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/objective-c/objective-c.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/objective-c/objective-c.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pascal/pascal.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pascal/pascal.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pascal/pascal.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pascal/pascal.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pascaligo/pascaligo.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pascaligo/pascaligo.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pascaligo/pascaligo.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pascaligo/pascaligo.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/perl/perl.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/perl/perl.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/perl/perl.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/perl/perl.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pgsql/pgsql.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pgsql/pgsql.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pgsql/pgsql.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pgsql/pgsql.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/php/php.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/php/php.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/php/php.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/php/php.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pla/pla.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pla/pla.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pla/pla.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pla/pla.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/postiats/postiats.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/postiats/postiats.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/postiats/postiats.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/postiats/postiats.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/powerquery/powerquery.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/powerquery/powerquery.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/powerquery/powerquery.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/powerquery/powerquery.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/powershell/powershell.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/powershell/powershell.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/powershell/powershell.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/powershell/powershell.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/protobuf/protobuf.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/protobuf/protobuf.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/protobuf/protobuf.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/protobuf/protobuf.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pug/pug.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pug/pug.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/pug/pug.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/pug/pug.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/python/python.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/python/python.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/python/python.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/python/python.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/qsharp/qsharp.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/qsharp/qsharp.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/qsharp/qsharp.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/qsharp/qsharp.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/r/r.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/r/r.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/r/r.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/r/r.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/razor/razor.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/razor/razor.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/razor/razor.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/razor/razor.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/redis/redis.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/redis/redis.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/redis/redis.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/redis/redis.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/redshift/redshift.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/redshift/redshift.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/redshift/redshift.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/redshift/redshift.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/restructuredtext/restructuredtext.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/restructuredtext/restructuredtext.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/restructuredtext/restructuredtext.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/restructuredtext/restructuredtext.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/ruby/ruby.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/ruby/ruby.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/ruby/ruby.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/ruby/ruby.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/rust/rust.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/rust/rust.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/rust/rust.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/rust/rust.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sb/sb.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sb/sb.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sb/sb.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sb/sb.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/scala/scala.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/scala/scala.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/scala/scala.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/scala/scala.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/scheme/scheme.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/scheme/scheme.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/scheme/scheme.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/scheme/scheme.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/scss/scss.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/scss/scss.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/scss/scss.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/scss/scss.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/shell/shell.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/shell/shell.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/shell/shell.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/shell/shell.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/solidity/solidity.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/solidity/solidity.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/solidity/solidity.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/solidity/solidity.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sophia/sophia.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sophia/sophia.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sophia/sophia.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sophia/sophia.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sparql/sparql.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sparql/sparql.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sparql/sparql.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sparql/sparql.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sql/sql.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sql/sql.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/sql/sql.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/sql/sql.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/st/st.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/st/st.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/st/st.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/st/st.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/swift/swift.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/swift/swift.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/swift/swift.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/swift/swift.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/systemverilog/systemverilog.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/systemverilog/systemverilog.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/systemverilog/systemverilog.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/systemverilog/systemverilog.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/tcl/tcl.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/tcl/tcl.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/tcl/tcl.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/tcl/tcl.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/twig/twig.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/twig/twig.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/twig/twig.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/twig/twig.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/typescript/typescript.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/typescript/typescript.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/typescript/typescript.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/typescript/typescript.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/vb/vb.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/vb/vb.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/vb/vb.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/vb/vb.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/wgsl/wgsl.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/wgsl/wgsl.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/wgsl/wgsl.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/wgsl/wgsl.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/xml/xml.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/xml/xml.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/xml/xml.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/xml/xml.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/yaml/yaml.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/yaml/yaml.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/basic-languages/yaml/yaml.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/basic-languages/yaml/yaml.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.css b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.css similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.css rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.css diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.de.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.de.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.de.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.de.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.es.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.es.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.es.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.es.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.fr.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.fr.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.fr.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.fr.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.it.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.it.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.it.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.it.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.ja.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.ja.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.ja.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.ja.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.ko.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.ko.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.ko.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.ko.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.ru.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.ru.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.ru.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.ru.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.zh-cn.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.zh-cn.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.zh-cn.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.zh-cn.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.zh-tw.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.zh-tw.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/editor/editor.main.nls.zh-tw.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/editor/editor.main.nls.zh-tw.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/css/cssMode.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/css/cssMode.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/css/cssMode.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/css/cssMode.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/css/cssWorker.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/css/cssWorker.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/css/cssWorker.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/css/cssWorker.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/html/htmlMode.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/html/htmlMode.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/html/htmlMode.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/html/htmlMode.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/html/htmlWorker.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/html/htmlWorker.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/html/htmlWorker.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/html/htmlWorker.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/json/jsonMode.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/json/jsonMode.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/json/jsonMode.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/json/jsonMode.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/json/jsonWorker.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/json/jsonWorker.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/json/jsonWorker.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/json/jsonWorker.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/typescript/tsMode.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/typescript/tsMode.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/typescript/tsMode.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/typescript/tsMode.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/language/typescript/tsWorker.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/typescript/tsWorker.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/language/typescript/tsWorker.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/language/typescript/tsWorker.js diff --git a/src/common/FilePreviewCommon/monacoSRC/min/vs/loader.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/loader.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSRC/min/vs/loader.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSRC/min/vs/loader.js diff --git a/src/common/FilePreviewCommon/monacoSpecialLanguages.js b/src/common/FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js similarity index 100% rename from src/common/FilePreviewCommon/monacoSpecialLanguages.js rename to src/common/FilePreviewCommon/Assets/Monaco/monacoSpecialLanguages.js diff --git a/src/common/FilePreviewCommon/monaco_languages.json b/src/common/FilePreviewCommon/Assets/Monaco/monaco_languages.json similarity index 100% rename from src/common/FilePreviewCommon/monaco_languages.json rename to src/common/FilePreviewCommon/Assets/Monaco/monaco_languages.json diff --git a/src/common/FilePreviewCommon/FilePreviewCommon.csproj b/src/common/FilePreviewCommon/FilePreviewCommon.csproj index 01fdead645..2d73eadf9f 100644 --- a/src/common/FilePreviewCommon/FilePreviewCommon.csproj +++ b/src/common/FilePreviewCommon/FilePreviewCommon.csproj @@ -17,22 +17,22 @@ - + Always - + Always - + Always - + Always - + Always - + Always diff --git a/src/common/FilePreviewCommon/MonacoHelper.cs b/src/common/FilePreviewCommon/MonacoHelper.cs index d99165a2b7..236597c3a1 100644 --- a/src/common/FilePreviewCommon/MonacoHelper.cs +++ b/src/common/FilePreviewCommon/MonacoHelper.cs @@ -28,20 +28,20 @@ namespace Microsoft.PowerToys.FilePreviewCommon new XmlFormatter(), }.AsReadOnly(); - /// - /// Gets the path of the current assembly. - /// - /// - /// Source: https://stackoverflow.com/a/283917/14774889 - /// - public static string AssemblyDirectory + private static string _monacoDirectory; + + public static string GetRuntimeMonacoDirectory() { - get + string codeBase = Assembly.GetExecutingAssembly().Location; + string path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase), "Assets", "Monaco")); + if (Path.Exists(path)) { - string codeBase = Assembly.GetExecutingAssembly().Location; - UriBuilder uri = new UriBuilder(codeBase); - string path = Uri.UnescapeDataString(uri.Path); - return Path.GetDirectoryName(path); + return path; + } + else + { + // We're likely in WinUI3Apps directory and need to go back to the base directory. + return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase), "..", "Assets", "Monaco")); } } @@ -49,10 +49,12 @@ namespace Microsoft.PowerToys.FilePreviewCommon { get { - // TODO: common monaco folder - string codeBase = Assembly.GetExecutingAssembly().Location; - string path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(codeBase), "..", "FileExplorerPreview")); - return path; + if (string.IsNullOrEmpty(_monacoDirectory)) + { + _monacoDirectory = GetRuntimeMonacoDirectory(); + } + + return _monacoDirectory; } } diff --git a/src/common/GPOWrapper/GPOWrapper.vcxproj b/src/common/GPOWrapper/GPOWrapper.vcxproj index 9ae857ded1..1316b4fa41 100644 --- a/src/common/GPOWrapper/GPOWrapper.vcxproj +++ b/src/common/GPOWrapper/GPOWrapper.vcxproj @@ -15,8 +15,6 @@ false Windows Store 10.0 - 10.0.20348.0 - 10.0.17134.0 diff --git a/src/common/GPOWrapperProjection/GPOWrapperProjection.csproj b/src/common/GPOWrapperProjection/GPOWrapperProjection.csproj index 4cfc2521c6..3fd2a3d1b9 100644 --- a/src/common/GPOWrapperProjection/GPOWrapperProjection.csproj +++ b/src/common/GPOWrapperProjection/GPOWrapperProjection.csproj @@ -1,7 +1,9 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 enable enable PowerToys.GPOWrapperProjection diff --git a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj index d2d431e0db..8ee768403b 100644 --- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj +++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj @@ -13,6 +13,7 @@ DynamicLibrary false v143 + $(SolutionDir)$(Platform)\$(Configuration)\tests\UnitTestsCommonLib\ diff --git a/src/common/interop/PowerToys.Interop.vcxproj b/src/common/interop/PowerToys.Interop.vcxproj index 7f2f3f7da0..5469432cd0 100644 --- a/src/common/interop/PowerToys.Interop.vcxproj +++ b/src/common/interop/PowerToys.Interop.vcxproj @@ -47,7 +47,7 @@ PowerToys.Interop - $(SolutionDir)$(Platform)\$(Configuration)\ + ..\..\..\$(Platform)\$(Configuration)\ true diff --git a/src/common/logger/logger.vcxproj b/src/common/logger/logger.vcxproj index b200958002..5eae1656af 100644 --- a/src/common/logger/logger.vcxproj +++ b/src/common/logger/logger.vcxproj @@ -37,7 +37,7 @@ StaticLibrary v143 - $(SolutionDir)$(Platform)\$(Configuration)\ + ..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj index ad8575164a..671f6e958f 100644 --- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj +++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj @@ -45,7 +45,6 @@ notifications - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ @@ -62,8 +61,6 @@ $(IntDir)pch.pch Level4 %(AdditionalOptions) /bigobj - - /DWINRT_NO_MAKE_DETECTION /await %(AdditionalOptions) _WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) diff --git a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj index 2b0f0ba00d..9ac181cf45 100644 --- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj +++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj @@ -37,7 +37,7 @@ Level4 - WINRT_NO_MAKE_DETECTION;NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + NDEBUG;NOTIFICATIONSDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false diff --git a/src/common/utils/modulesRegistry.h b/src/common/utils/modulesRegistry.h index 03680e9562..f4a6564bae 100644 --- a/src/common/utils/modulesRegistry.h +++ b/src/common/utils/modulesRegistry.h @@ -10,7 +10,7 @@ namespace fs = std::filesystem; namespace NonLocalizable { - const static wchar_t* MONACO_LANGUAGES_FILE_NAME = L"modules\\FileExplorerPreview\\monaco_languages.json"; + const static wchar_t* MONACO_LANGUAGES_FILE_NAME = L"Assets\\Monaco\\monaco_languages.json"; const static wchar_t* ListID = L"list"; const static wchar_t* ExtensionsID = L"extensions"; const static std::vector ExtSVG = { L".svg" }; @@ -31,7 +31,7 @@ inline registry::ChangeSet getSvgPreviewHandlerChangeSet(const std::wstring inst L"{FCDD4EED-41AA-492F-8A84-31A1546226E0}", get_std_product_version(), (fs::path{ installationDir } / - LR"d(modules\FileExplorerPreview\PowerToys.SvgPreviewHandlerCpp.dll)d") + LR"d(PowerToys.SvgPreviewHandlerCpp.dll)d") .wstring(), L"SvgPreviewHandler", L"Svg Preview Handler", @@ -45,7 +45,7 @@ inline registry::ChangeSet getMdPreviewHandlerChangeSet(const std::wstring insta perUser, L"{60789D87-9C3C-44AF-B18C-3DE2C2820ED3}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.MarkdownPreviewHandlerCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.MarkdownPreviewHandlerCpp.dll)d").wstring(), L"MarkdownPreviewHandler", L"Markdown Preview Handler", NonLocalizable::ExtMarkdown); @@ -113,7 +113,7 @@ inline registry::ChangeSet getMonacoPreviewHandlerChangeSet(const std::wstring i perUser, L"{D8034CFA-F34B-41FE-AD45-62FCBB52A6DA}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.MonacoPreviewHandlerCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.MonacoPreviewHandlerCpp.dll)d").wstring(), L"MonacoPreviewHandler", L"Monaco Preview Handler", extensions); @@ -126,7 +126,7 @@ inline registry::ChangeSet getPdfPreviewHandlerChangeSet(const std::wstring inst perUser, L"{A5A41CC7-02CB-41D4-8C9B-9087040D6098}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.PdfPreviewHandlerCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.PdfPreviewHandlerCpp.dll)d").wstring(), L"PdfPreviewHandler", L"Pdf Preview Handler", NonLocalizable::ExtPDF); @@ -139,7 +139,7 @@ inline registry::ChangeSet getGcodePreviewHandlerChangeSet(const std::wstring in perUser, L"{A0257634-8812-4CE8-AF11-FA69ACAEAFAE}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.GcodePreviewHandlerCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.GcodePreviewHandlerCpp.dll)d").wstring(), L"GcodePreviewHandler", L"G-code Preview Handler", NonLocalizable::ExtGCode); @@ -152,7 +152,7 @@ inline registry::ChangeSet getSvgThumbnailHandlerChangeSet(const std::wstring in perUser, L"{10144713-1526-46C9-88DA-1FB52807A9FF}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.SvgThumbnailProviderCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.SvgThumbnailProviderCpp.dll)d").wstring(), L"SvgThumbnailProvider", L"Svg Thumbnail Provider", NonLocalizable::ExtSVG, @@ -166,7 +166,7 @@ inline registry::ChangeSet getPdfThumbnailHandlerChangeSet(const std::wstring in perUser, L"{D8BB9942-93BD-412D-87E4-33FAB214DC1A}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.PdfThumbnailProviderCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.PdfThumbnailProviderCpp.dll)d").wstring(), L"PdfThumbnailProvider", L"Pdf Thumbnail Provider", NonLocalizable::ExtPDF); @@ -179,7 +179,7 @@ inline registry::ChangeSet getGcodeThumbnailHandlerChangeSet(const std::wstring perUser, L"{F2847CBE-CD03-4C83-A359-1A8052C1B9D5}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.GcodeThumbnailProviderCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.GcodeThumbnailProviderCpp.dll)d").wstring(), L"GcodeThumbnailProvider", L"G-code Thumbnail Provider", NonLocalizable::ExtGCode); @@ -192,7 +192,7 @@ inline registry::ChangeSet getStlThumbnailHandlerChangeSet(const std::wstring in perUser, L"{77257004-6F25-4521-B602-50ECC6EC62A6}", get_std_product_version(), - (fs::path{ installationDir } / LR"d(modules\FileExplorerPreview\PowerToys.StlThumbnailProviderCpp.dll)d").wstring(), + (fs::path{ installationDir } / LR"d(PowerToys.StlThumbnailProviderCpp.dll)d").wstring(), L"StlThumbnailProvider", L"Stl Thumbnail Provider", NonLocalizable::ExtSTL); @@ -209,7 +209,7 @@ inline registry::ChangeSet getRegistryPreviewSetDefaultAppChangeSet(const std::w std::wstring fullAppName = L"PowerToys.RegistryPreview"; std::wstring registryKeyPrefix = L"Software\\Classes\\"; - std::wstring appPath = installationDir + L"\\modules\\RegistryPreview\\PowerToys.RegistryPreview.exe"; + std::wstring appPath = installationDir + L"\\WinUI3Apps\\PowerToys.RegistryPreview.exe"; std::wstring command = appPath + L" \"----ms-protocol:ms-encodedlaunch:App?ContractId=Windows.File&Verb=open&File=%1\""; changes.push_back({ scope, registryKeyPrefix + fullAppName + L"\\" + L"Application", L"ApplicationName", appName }); @@ -228,11 +228,11 @@ inline registry::ChangeSet getRegistryPreviewChangeSet(const std::wstring instal vec_t changes; std::wstring command = installationDir; - command.append(L"\\modules\\RegistryPreview\\PowerToys.RegistryPreview.exe \"%1\""); + command.append(L"\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"%1\""); changes.push_back({ scope, L"Software\\Classes\\regfile\\shell\\preview\\command", std::nullopt, command }); std::wstring icon_path = installationDir; - icon_path.append(L"\\modules\\RegistryPreview\\app.ico"); + icon_path.append(L"\\WinUI3Apps\\Assets\\RegistryPreview\\app.ico"); changes.push_back({ scope, L"Software\\Classes\\regfile\\shell\\preview", L"icon", icon_path }); return { changes }; diff --git a/src/logging/logging.vcxproj b/src/logging/logging.vcxproj index 3f39a7e647..ee1c6a7078 100644 --- a/src/logging/logging.vcxproj +++ b/src/logging/logging.vcxproj @@ -30,7 +30,6 @@ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F} Win32Proj spdlog - 10.0.19041.0 @@ -38,7 +37,7 @@ StaticLibrary MultiByte v143 - $(SolutionDir)$(Platform)\$(Configuration)\ + ..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.base.rc b/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.base.rc index ea565d98f9..9ac2befbef 100644 --- a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.base.rc +++ b/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.base.rc @@ -54,4 +54,4 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FILELOCKSMITH ICON "..\\FileLocksmithUI\\Assets\\Icon.ico" \ No newline at end of file +IDI_FILELOCKSMITH ICON "..\\FileLocksmithUI\\Assets\\FileLocksmith\\Icon.ico" \ No newline at end of file diff --git a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj b/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj index d21a9eb775..53b0bd9dcf 100644 --- a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj +++ b/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj @@ -35,7 +35,8 @@ Win32Proj {57175ec7-92a5-4c1e-8244-e3fbca2a81de} FileLocksmithExt - 10.0.19041.0 + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ + PowerToys.FileLocksmithExt @@ -101,30 +102,6 @@ - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithExt - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithExt - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithExt - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithExt - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithExt - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithExt - Level3 diff --git a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj index 4f9e6aef63..6e76ed1714 100644 --- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj +++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj @@ -31,8 +31,9 @@ Win32Proj {c604b37e-9d0e-4484-8778-e8b31b0e1b3a} FileLocksmithLibInterop - 10.0.19041.0 net7.0-windows + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ + PowerToys.FileLocksmithLib.Interop @@ -104,30 +105,6 @@ - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithLib.Interop - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithLib.Interop - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithLib.Interop - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithLib.Interop - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithLib.Interop - - - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileLocksmith\ - PowerToys.FileLocksmithLib.Interop - Level3 diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-100.png b/src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-100.png similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-100.png rename to src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-100.png diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-125.png b/src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-125.png similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-125.png rename to src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-125.png diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-150.png b/src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-150.png similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-150.png rename to src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-150.png diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-200.png b/src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-200.png similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-200.png rename to src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-200.png diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-400.png b/src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-400.png similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Assets/AppList.scale-400.png rename to src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/AppList.scale-400.png diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Assets/Icon.ico b/src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/Icon.ico similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Assets/Icon.ico rename to src/modules/FileLocksmith/FileLocksmithUI/Assets/FileLocksmith/Icon.ico diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj index c2dfe3edfe..4772e0cc63 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj @@ -5,9 +5,10 @@ PowerToys.FileLocksmith PowerToys File Locksmith WinExe - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 10.0.19041.0 - ..\..\..\..\$(Platform)\$(Configuration)\modules\FileLocksmith + 10.0.19041.0 + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps PowerToys.FileLocksmithUI PowerToys.FileLocksmithUI app.manifest @@ -19,11 +20,19 @@ true None true - 10.0.19041.0 - Assets/Icon.ico + Assets/FileLocksmith/Icon.ico true + + PowerToys.FileLocksmithUI.pri + + + + + + + win10-x64 @@ -37,16 +46,15 @@ - + - - - - - - + + + + + @@ -84,14 +92,11 @@ + + - - - MSBuild:Compile - - diff --git a/src/modules/FileLocksmith/FileLocksmithUI/App.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/App.xaml rename to src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml diff --git a/src/modules/FileLocksmith/FileLocksmithUI/App.xaml.cs b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml.cs similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/App.xaml.cs rename to src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml.cs diff --git a/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml similarity index 96% rename from src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml rename to src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml index b040296e39..fa45888f23 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml @@ -33,7 +33,7 @@ diff --git a/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml.cs b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs similarity index 95% rename from src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml.cs rename to src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs index d867aa7126..3e74270abf 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml.cs +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs @@ -20,7 +20,7 @@ namespace FileLocksmithUI ExtendsContentIntoTitleBar = true; SetTitleBar(AppTitleBar); Activated += MainWindow_Activated; - AppWindow.SetIcon("Assets/Icon.ico"); + AppWindow.SetIcon("Assets/FileLocksmith/Icon.ico"); } private void MainWindow_Activated(object sender, WindowActivatedEventArgs args) diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Views/MainPage.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Views/MainPage.xaml rename to src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Views/MainPage.xaml.cs b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml.cs similarity index 100% rename from src/modules/FileLocksmith/FileLocksmithUI/Views/MainPage.xaml.cs rename to src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml.cs diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index a4a0a4c4f1..1a0c71a859 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\FileLocksmith + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps win10-$(Platform) true False diff --git a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj index dc75cf4b59..3cbcdab9ec 100644 --- a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj +++ b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj @@ -2,13 +2,14 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 win10-x64;win10-arm64 false false false - $(SolutionDir)$(Platform)\$(Configuration)\modules\Hosts\Hosts.Tests\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\Hosts.Tests\ Hosts.Tests PowerToys.Hosts.Tests diff --git a/src/modules/Hosts/Hosts/Assets/AppList.scale-100.png b/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-100.png similarity index 100% rename from src/modules/Hosts/Hosts/Assets/AppList.scale-100.png rename to src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-100.png diff --git a/src/modules/Hosts/Hosts/Assets/AppList.scale-125.png b/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-125.png similarity index 100% rename from src/modules/Hosts/Hosts/Assets/AppList.scale-125.png rename to src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-125.png diff --git a/src/modules/Hosts/Hosts/Assets/AppList.scale-150.png b/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-150.png similarity index 100% rename from src/modules/Hosts/Hosts/Assets/AppList.scale-150.png rename to src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-150.png diff --git a/src/modules/Hosts/Hosts/Assets/AppList.scale-200.png b/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-200.png similarity index 100% rename from src/modules/Hosts/Hosts/Assets/AppList.scale-200.png rename to src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-200.png diff --git a/src/modules/Hosts/Hosts/Assets/AppList.scale-400.png b/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-400.png similarity index 100% rename from src/modules/Hosts/Hosts/Assets/AppList.scale-400.png rename to src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-400.png diff --git a/src/modules/Hosts/Hosts/Assets/Hosts.ico b/src/modules/Hosts/Hosts/Assets/Hosts/Hosts.ico similarity index 100% rename from src/modules/Hosts/Hosts/Assets/Hosts.ico rename to src/modules/Hosts/Hosts/Assets/Hosts/Hosts.ico diff --git a/src/modules/Hosts/Hosts/Helpers/ResourceLoaderInstance.cs b/src/modules/Hosts/Hosts/Helpers/ResourceLoaderInstance.cs new file mode 100644 index 0000000000..c7339998a8 --- /dev/null +++ b/src/modules/Hosts/Hosts/Helpers/ResourceLoaderInstance.cs @@ -0,0 +1,17 @@ +// 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 Microsoft.Windows.ApplicationModel.Resources; + +namespace Hosts.Helpers +{ + internal static class ResourceLoaderInstance + { + internal static ResourceLoader ResourceLoader { get; private set; } + + static ResourceLoaderInstance() + { + ResourceLoader = new Microsoft.Windows.ApplicationModel.Resources.ResourceLoader("PowerToys.Hosts.pri"); + } + } +} diff --git a/src/modules/Hosts/Hosts/Hosts.csproj b/src/modules/Hosts/Hosts/Hosts.csproj index 36e0ac4436..f0d323a74a 100644 --- a/src/modules/Hosts/Hosts/Hosts.csproj +++ b/src/modules/Hosts/Hosts/Hosts.csproj @@ -3,8 +3,9 @@ WinExe - net7.0-windows10.0.19041.0 - 10.0.17763.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 Hosts app.manifest win10-x64;win10-arm64 @@ -14,15 +15,23 @@ false false true - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(AssemblyName) - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName) + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps Hosts PowerToys.Hosts DISABLE_XAML_GENERATED_MAIN,TRACE - Assets/Hosts.ico + Assets/Hosts/Hosts.ico true + + PowerToys.Hosts.pri + + + + + + + win10-x64 @@ -38,11 +47,11 @@ false - - - - - + + + + + @@ -69,9 +78,4 @@ - - - MSBuild:Compile - - diff --git a/src/modules/Hosts/Hosts/App.xaml b/src/modules/Hosts/Hosts/HostsXAML/App.xaml similarity index 100% rename from src/modules/Hosts/Hosts/App.xaml rename to src/modules/Hosts/Hosts/HostsXAML/App.xaml diff --git a/src/modules/Hosts/Hosts/App.xaml.cs b/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs similarity index 100% rename from src/modules/Hosts/Hosts/App.xaml.cs rename to src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs diff --git a/src/modules/Hosts/Hosts/MainWindow.xaml b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml similarity index 97% rename from src/modules/Hosts/Hosts/MainWindow.xaml rename to src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml index f04b4e8832..02cca0755d 100644 --- a/src/modules/Hosts/Hosts/MainWindow.xaml +++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml @@ -29,7 +29,7 @@ diff --git a/src/modules/Hosts/Hosts/MainWindow.xaml.cs b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs similarity index 91% rename from src/modules/Hosts/Hosts/MainWindow.xaml.cs rename to src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs index 1e66190f68..e32d042ede 100644 --- a/src/modules/Hosts/Hosts/MainWindow.xaml.cs +++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs @@ -18,8 +18,8 @@ namespace Hosts ExtendsContentIntoTitleBar = true; SetTitleBar(titleBar); - AppWindow.SetIcon("Assets/Hosts.ico"); - Title = Windows.ApplicationModel.Resources.ResourceLoader.GetForViewIndependentUse().GetString("WindowTitle"); + AppWindow.SetIcon("Assets/Hosts/Hosts.ico"); + Title = ResourceLoaderInstance.ResourceLoader.GetString("WindowTitle"); BringToForeground(); diff --git a/src/modules/Hosts/Hosts/Views/MainPage.xaml b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml similarity index 100% rename from src/modules/Hosts/Hosts/Views/MainPage.xaml rename to src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml diff --git a/src/modules/Hosts/Hosts/Views/MainPage.xaml.cs b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml.cs similarity index 97% rename from src/modules/Hosts/Hosts/Views/MainPage.xaml.cs rename to src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml.cs index 50afe829a2..a2f3f0ba68 100644 --- a/src/modules/Hosts/Hosts/Views/MainPage.xaml.cs +++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml.cs @@ -14,7 +14,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Input; -using Windows.ApplicationModel.Resources; using Windows.System; using Windows.UI.Core; @@ -47,7 +46,7 @@ namespace Hosts.Views private async Task OpenNewDialogAsync() { - var resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; EntryDialog.Title = resourceLoader.GetString("AddNewEntryDialog_Title"); EntryDialog.PrimaryButtonText = resourceLoader.GetString("AddBtn"); EntryDialog.PrimaryButtonCommand = AddCommand; @@ -68,7 +67,7 @@ namespace Hosts.Views public async Task ShowEditDialogAsync(Entry entry) { - var resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; ViewModel.Selected = entry; EntryDialog.Title = resourceLoader.GetString("UpdateEntry_Title"); EntryDialog.PrimaryButtonText = resourceLoader.GetString("UpdateBtn"); @@ -160,7 +159,7 @@ namespace Hosts.Views var userSettings = App.GetService(); if (userSettings.ShowStartupWarning) { - var resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; var dialog = new ContentDialog(); dialog.XamlRoot = XamlRoot; diff --git a/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs b/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs index 6b5f1101ed..6eb536556f 100644 --- a/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs +++ b/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs @@ -254,7 +254,7 @@ namespace Hosts.ViewModels [RelayCommand] public void OpenSettings() { - SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.Hosts); + SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.Hosts, true); } [RelayCommand] diff --git a/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj b/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj index 9ad58f6a7b..d921876834 100644 --- a/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj +++ b/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj @@ -35,7 +35,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\Hosts\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ PowerToys.HostsModuleInterface diff --git a/src/modules/Hosts/HostsModuleInterface/dllmain.cpp b/src/modules/Hosts/HostsModuleInterface/dllmain.cpp index e62fcc21b0..14f2c0b0b3 100644 --- a/src/modules/Hosts/HostsModuleInterface/dllmain.cpp +++ b/src/modules/Hosts/HostsModuleInterface/dllmain.cpp @@ -88,7 +88,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\Hosts\\PowerToys.Hosts.exe"; + sei.lpFile = L"WinUI3Apps\\PowerToys.Hosts.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj index 6b8f09a112..d93e7aeb11 100644 --- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj +++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj @@ -22,6 +22,7 @@ Windows Store 10.0 true + 10.0.20348.0 10.0.19041.0 true @@ -43,7 +44,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MeasureTool\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ diff --git a/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj b/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj index bb21b46665..e121cb9104 100644 --- a/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj +++ b/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj @@ -32,7 +32,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MeasureTool\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ PowerToys.MeasureToolModuleInterface diff --git a/src/modules/MeasureTool/MeasureToolModuleInterface/dllmain.cpp b/src/modules/MeasureTool/MeasureToolModuleInterface/dllmain.cpp index 4148effdb1..62ff786429 100644 --- a/src/modules/MeasureTool/MeasureToolModuleInterface/dllmain.cpp +++ b/src/modules/MeasureTool/MeasureToolModuleInterface/dllmain.cpp @@ -104,7 +104,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\MeasureTool\\PowerToys.MeasureToolUI.exe"; + sei.lpFile = L"WinUI3Apps\\PowerToys.MeasureToolUI.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei)) diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/LockScreenLogo.scale-200.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/LockScreenLogo.scale-200.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/LockScreenLogo.scale-200.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/LockScreenLogo.scale-200.png diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/SplashScreen.scale-200.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/SplashScreen.scale-200.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/SplashScreen.scale-200.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/SplashScreen.scale-200.png diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/Square150x150Logo.scale-200.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Square150x150Logo.scale-200.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/Square150x150Logo.scale-200.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Square150x150Logo.scale-200.png diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/Square44x44Logo.scale-200.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Square44x44Logo.scale-200.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/Square44x44Logo.scale-200.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Square44x44Logo.scale-200.png diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/StoreLogo.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/StoreLogo.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/StoreLogo.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/StoreLogo.png diff --git a/src/modules/MeasureTool/MeasureToolUI/Assets/Wide310x150Logo.scale-200.png b/src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Wide310x150Logo.scale-200.png similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/Assets/Wide310x150Logo.scale-200.png rename to src/modules/MeasureTool/MeasureToolUI/Assets/MeasureTool/Wide310x150Logo.scale-200.png diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj index d14ff58db8..61c8d6242a 100644 --- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj +++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj @@ -7,7 +7,7 @@ WinExe net7.0-windows10.0.20348.0 10.0.19041.0 - $(SolutionDir)$(Platform)\$(Configuration)\modules\MeasureTool + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps PowerToys.MeasureToolUI PowerToys.MeasureToolUI app.manifest @@ -22,7 +22,17 @@ true 10.0.19041.0 true + + PowerToys.MeasureToolUI.pri + + + + + + + + win10-x64 @@ -59,13 +69,13 @@ - - - - - - - + + + + + + + @@ -83,9 +93,8 @@ - - - + + diff --git a/src/modules/MeasureTool/MeasureToolUI/App.xaml b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/App.xaml rename to src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml diff --git a/src/modules/MeasureTool/MeasureToolUI/App.xaml.cs b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml.cs similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/App.xaml.cs rename to src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml.cs diff --git a/src/modules/MeasureTool/MeasureToolUI/MainWindow.xaml b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/MainWindow.xaml rename to src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml diff --git a/src/modules/MeasureTool/MeasureToolUI/MainWindow.xaml.cs b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs similarity index 100% rename from src/modules/MeasureTool/MeasureToolUI/MainWindow.xaml.cs rename to src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs diff --git a/src/modules/MeasureTool/MeasureToolUI/Package.appxmanifest b/src/modules/MeasureTool/MeasureToolUI/Package.appxmanifest index 6333d391c0..e8ab70bad7 100644 --- a/src/modules/MeasureTool/MeasureToolUI/Package.appxmanifest +++ b/src/modules/MeasureTool/MeasureToolUI/Package.appxmanifest @@ -14,7 +14,7 @@ MeasureToolUI nielslaute - Assets\StoreLogo.png + Assets\MeasureTool\StoreLogo.png @@ -34,10 +34,10 @@ DisplayName="MeasureToolUI" Description="MeasureToolUI" BackgroundColor="transparent" - Square150x150Logo="Assets\Square150x150Logo.png" - Square44x44Logo="Assets\Square44x44Logo.png"> - - + Square150x150Logo="Assets\MeasureTool\Square150x150Logo.png" + Square44x44Logo="Assets\MeasureTool\Square44x44Logo.png"> + + diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj index cd8ff70112..28ff78ab9a 100644 --- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj +++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj @@ -32,7 +32,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.FindMyMouse diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj index db9cf79d5a..6d1489d92c 100644 --- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj +++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj @@ -6,7 +6,6 @@ {782a61be-9d85-4081-b35c-1ccc9dcc1e88} Win32Proj MouseHighlighter - 10.0.19041.0 MouseHighlighter @@ -33,7 +32,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.MouseHighlighter diff --git a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj index 16b9692ffd..284ecfbdf6 100644 --- a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj +++ b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj @@ -32,7 +32,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.MouseJump diff --git a/src/modules/MouseUtils/MouseJump/dllmain.cpp b/src/modules/MouseUtils/MouseJump/dllmain.cpp index 4be0abdc48..8699fc4fad 100644 --- a/src/modules/MouseUtils/MouseJump/dllmain.cpp +++ b/src/modules/MouseUtils/MouseJump/dllmain.cpp @@ -107,7 +107,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\MouseUtils\\MouseJumpUI\\PowerToys.MouseJumpUI.exe"; + sei.lpFile = L"PowerToys.MouseJumpUI.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei)) diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj index 67886dc272..701ef550a6 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj +++ b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj @@ -2,7 +2,9 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {D9C5DE64-6849-4278-91AD-9660AECF2876} Microsoft.MouseJumpUI.UnitTests false @@ -12,7 +14,7 @@ - ..\..\..\..\$(Platform)\$(Configuration)\modules\MouseUtils\MouseJumpUI.UnitTests\ + ..\..\..\..\$(Platform)\$(Configuration)\tests\MouseJumpUI.UnitTests\ diff --git a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj index 8d15866ace..478e7afe1e 100644 --- a/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj +++ b/src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj @@ -4,7 +4,7 @@ PowerToys.MouseJumpUI PowerToys MouseJumpUI $(Version).0 - ..\..\..\..\$(Platform)\$(Configuration)\modules\MouseUtils\MouseJumpUI + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -32,7 +32,9 @@ WinExe MouseJumpUI PowerToys.MouseJumpUI - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj index 920dcf8efd..870f088206 100644 --- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj +++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj @@ -6,7 +6,6 @@ {eae14c0e-7a6b-45da-9080-a7d8c077ba6e} Win32Proj MousePointerCrosshairs - 10.0.19041.0 MousePointerCrosshairs @@ -34,7 +33,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseUtils\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.MousePointerCrosshairs diff --git a/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj b/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj index 9d5d403e59..6dd3cb14ae 100644 --- a/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj +++ b/src/modules/MouseWithoutBorders/App/Helper/MouseWithoutBordersHelper.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 WinExe true false @@ -9,7 +11,7 @@ PowerToys.MouseWithoutBordersHelper true true - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseWithoutBorders + ..\..\..\..\..\$(Platform)\$(Configuration) true true $(Version).0 diff --git a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj index a526b68449..aed12d1ee4 100644 --- a/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj +++ b/src/modules/MouseWithoutBorders/App/MouseWithoutBorders.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 WinExe true false @@ -9,7 +11,7 @@ PowerToys.MouseWithoutBorders true true - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseWithoutBorders + ..\..\..\..\$(Platform)\$(Configuration) true true $(Version).0 diff --git a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj index c4dcbd5a0f..cd9de124a7 100644 --- a/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj +++ b/src/modules/MouseWithoutBorders/App/Service/MouseWithoutBordersService.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true WinExe true @@ -10,7 +12,7 @@ PowerToys.MouseWithoutBordersService true true - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseWithoutBorders + ..\..\..\..\..\$(Platform)\$(Configuration) true true $(Version).0 @@ -72,11 +74,13 @@ + + diff --git a/src/modules/MouseWithoutBorders/App/Service/Program.cs b/src/modules/MouseWithoutBorders/App/Service/Program.cs index 736a901274..6d33f2fa56 100644 --- a/src/modules/MouseWithoutBorders/App/Service/Program.cs +++ b/src/modules/MouseWithoutBorders/App/Service/Program.cs @@ -49,9 +49,14 @@ namespace MouseWithoutBordersService }) .Build(); + // These warning are disabled because StreamJsonRpc brings in thread analyzers to the project. Enable warnings once we adopt thread analyzers globally. +#pragma warning disable VSTHRD101 // Avoid unsupported async delegates +#pragma warning disable VSTHRD110 // Observe result of async calls CmdArgs.StopServiceDelegate = async () => { await host.StopAsync(); }; host.Run(); host.StopAsync(); +#pragma warning restore VSTHRD110 // Observe result of async calls +#pragma warning restore VSTHRD101 // Avoid unsupported async delegates } } } diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj index ea4339f065..6d9fc7e59e 100644 --- a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj +++ b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj @@ -22,7 +22,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\MouseWithoutBorders\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.MouseWithoutBordersModuleInterface diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp b/src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp index b4b24b6e7c..ad8dc5eaed 100644 --- a/src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp +++ b/src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp @@ -140,7 +140,7 @@ private: void launch_process() { Logger::trace(L"Launching PowerToys MouseWithoutBorders process"); - const std::wstring application_path = L"modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBorders.exe"; + const std::wstring application_path = L"PowerToys.MouseWithoutBorders.exe"; STARTUPINFO info = { sizeof(info) }; std::wstring full_command_path = application_path; if (run_in_service_mode) @@ -558,7 +558,7 @@ public: Logger::trace(L"Starting Process to add firewall rule"); std::wstring executable_path = get_module_folderpath(); - executable_path.append(L"\\modules\\MouseWithoutBorders\\PowerToys.MouseWithoutBorders.exe"); + executable_path.append(L"\\PowerToys.MouseWithoutBorders.exe"); std::wstring executable_args = L""; executable_args.append(L"/S /c \""); diff --git a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj index 5182b93440..ddabc2409d 100644 --- a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj +++ b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj @@ -3,7 +3,7 @@ PowerToys.PowerOCR - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerOCR + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -28,9 +28,10 @@ PowerOCRLogo.png PowerOCR PowerToys.PowerOCR - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {2150E333-8FDC-42A3-9474-1A3956D46DE8} - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PerMonitorV2 app.manifest diff --git a/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj b/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj index 1e7b72920a..a4c9a58b67 100644 --- a/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj +++ b/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj @@ -27,7 +27,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerOCR\ + ..\..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp b/src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp index c8e4f18396..f89dde5ce1 100644 --- a/src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp +++ b/src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp @@ -119,7 +119,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\PowerOCR\\PowerToys.PowerOCR.exe"; + sei.lpFile = L"PowerToys.PowerOCR.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei)) diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/0.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/0.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/0.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/0.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/1.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/1.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/1.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/1.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/2.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/2.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/2.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/2.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/3.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/3.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/3.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/3.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/4.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/4.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/4.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/4.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/5.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/5.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/5.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/5.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/6.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/6.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/6.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/6.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/7.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/7.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/7.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/7.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/8.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/8.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/8.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/8.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/9.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/9.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/9.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/9.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/no_active_window.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/no_active_window.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/no_active_window.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/no_active_window.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/overlay.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/overlay.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/overlay.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/overlay.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/svgs/overlay_portrait.svg b/src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/overlay_portrait.svg similarity index 100% rename from src/modules/ShortcutGuide/ShortcutGuide/svgs/overlay_portrait.svg rename to src/modules/ShortcutGuide/ShortcutGuide/Assets/ShortcutGuide/overlay_portrait.svg diff --git a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj index 2ca9c11f71..1336e68253 100644 --- a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj +++ b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj @@ -13,7 +13,6 @@ {2edb3eb4-fa92-4bff-b2d8-566584837231} Win32Proj ShortcutGuide - 10.0.19041.0 @@ -48,8 +47,7 @@ PowerToys.$(MSBuildProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\ShortcutGuide\$(ProjectName)\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\ShortcutGuide\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\ @@ -97,57 +95,9 @@ - + Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs - - - Document - $(OutDir)\svgs + $(OutDir)\Assets\ShortcutGuide diff --git a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj.filters b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj.filters index a97390b574..006a6196ef 100644 --- a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj.filters +++ b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj.filters @@ -11,10 +11,7 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {800507f8-718d-48d1-aa56-96c040795b8a} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;svg;tiff;tif;png;wav;mfcribbon-ms {cb917ac7-30da-494b-81f1-cbe4415e91f4} @@ -119,44 +116,8 @@ - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs - - - svgs + + Resource Files diff --git a/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp b/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp index 7ef1e90301..0a2c899e7d 100644 --- a/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp +++ b/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp @@ -499,19 +499,19 @@ float D2DOverlayWindow::get_overlay_opacity() void D2DOverlayWindow::init() { colors.update(); - landscape.load(L"svgs\\overlay.svg", d2d_dc.get()) + landscape.load(L"Assets\\ShortcutGuide\\overlay.svg", d2d_dc.get()) .find_thumbnail(L"monitorRect") .find_window_group(L"WindowControlsGroup") .recolor(0x2582FB, colors.start_color_menu); - portrait.load(L"svgs\\overlay_portrait.svg", d2d_dc.get()) + portrait.load(L"Assets\\ShortcutGuide\\overlay_portrait.svg", d2d_dc.get()) .find_thumbnail(L"monitorRect") .find_window_group(L"WindowControlsGroup") .recolor(0x2582FB, colors.start_color_menu); - no_active.load(L"svgs\\no_active_window.svg", d2d_dc.get()); + no_active.load(L"Assets\\ShortcutGuide\\no_active_window.svg", d2d_dc.get()); arrows.resize(10); for (unsigned i = 0; i < arrows.size(); ++i) { - arrows[i].load(L"svgs\\" + std::to_wstring((i + 1) % 10) + L".svg", d2d_dc.get()).recolor(0x2582FB, colors.start_color_menu); + arrows[i].load(L"Assets\\ShortcutGuide\\" + std::to_wstring((i + 1) % 10) + L".svg", d2d_dc.get()).recolor(0x2582FB, colors.start_color_menu); } light_mode = (theme_setting == Light) || (theme_setting == System && colors.light_mode); if (light_mode) diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj index 7276d89235..210381ce50 100644 --- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj +++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj @@ -9,7 +9,6 @@ Win32Proj {2d604c07-51fc-46bb-9eb7-75aecc7f5e81} ShortcutGuideModuleInterface - 10.0.19041.0 ShortcutGuideModuleInterface @@ -38,8 +37,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\ShortcutGuide\$(ProjectName)\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\ShortcutGuide\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.ShortcutGuideModuleInterface diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp index 297b5ab4bc..3b9963e8f5 100644 --- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp +++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp @@ -219,7 +219,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\ShortcutGuide\\ShortcutGuide\\PowerToys.ShortcutGuide.exe"; + sei.lpFile = L"PowerToys.ShortcutGuide.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei) == false) diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj index d6cb7d0773..12d38955d3 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj @@ -65,7 +65,6 @@ Application v143 - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ Unicode Spectre @@ -90,7 +89,7 @@ PowerToys.$(MSBuildProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\AlwaysOnTop\ + ..\..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj index 97e8dcb9a2..68d0596aee 100644 --- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj +++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj @@ -22,7 +22,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\AlwaysOnTop\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.AlwaysOnTopModuleInterface diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp index a7e4d48e1c..83158813c6 100644 --- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp +++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp @@ -15,7 +15,7 @@ namespace NonLocalizable { - const wchar_t ModulePath[] = L"modules\\AlwaysOnTop\\PowerToys.AlwaysOnTop.exe"; + const wchar_t ModulePath[] = L"PowerToys.AlwaysOnTop.exe"; } namespace diff --git a/src/modules/awake/Awake/Images/Awake.ico b/src/modules/awake/Awake/Assets/Awake/Awake.ico similarity index 100% rename from src/modules/awake/Awake/Images/Awake.ico rename to src/modules/awake/Awake/Assets/Awake/Awake.ico diff --git a/src/modules/awake/Awake/Awake.csproj b/src/modules/awake/Awake/Awake.csproj index fe7e7ab9ee..f31c22e62f 100644 --- a/src/modules/awake/Awake/Awake.csproj +++ b/src/modules/awake/Awake/Awake.csproj @@ -2,9 +2,11 @@ WinExe - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 win-x64;win-arm64 - $(SolutionDir)$(Platform)\$(Configuration)\modules\Awake + ..\..\..\..\$(Platform)\$(Configuration) enable false false @@ -13,8 +15,7 @@ true PowerToys.Awake $(Version).0 - Images\Awake.ico - 10.0.19041.0 + Assets\Awake\Awake.ico https://awake.den.dev https://github.com/microsoft/powertoys true @@ -57,7 +58,7 @@ - + @@ -81,7 +82,7 @@ - + Always diff --git a/src/modules/awake/Awake/Program.cs b/src/modules/awake/Awake/Program.cs index 4642d4f101..7475e98725 100644 --- a/src/modules/awake/Awake/Program.cs +++ b/src/modules/awake/Awake/Program.cs @@ -207,7 +207,7 @@ namespace Awake } }).Start(); - TrayHelper.InitializeTray(Core.Constants.FullAppName, new Icon(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "images/awake.ico")), _exitSignal); + TrayHelper.InitializeTray(Core.Constants.FullAppName, new Icon(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets/Awake/awake.ico")), _exitSignal); string? settingsPath = _settingsUtils!.GetSettingsFilePath(Core.Constants.AppName); Logger.LogInfo($"Reading configuration file: {settingsPath}"); diff --git a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj index aab948c45b..9639c9a6ff 100644 --- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj @@ -7,7 +7,6 @@ Win32Proj Awake AwakeModuleInterface - 10.0.19041.0 PowerToys.AwakeModuleInterface v143 @@ -25,7 +24,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\Awake\ + ..\..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/awake/AwakeModuleInterface/dllmain.cpp b/src/modules/awake/AwakeModuleInterface/dllmain.cpp index b302d6aa31..027eb9913c 100644 --- a/src/modules/awake/AwakeModuleInterface/dllmain.cpp +++ b/src/modules/awake/AwakeModuleInterface/dllmain.cpp @@ -59,7 +59,7 @@ private: unsigned long powertoys_pid = GetCurrentProcessId(); std::wstring executable_args = L"--use-pt-config --pid " + std::to_wstring(powertoys_pid); - std::wstring application_path = L"modules\\Awake\\PowerToys.Awake.exe"; + std::wstring application_path = L"PowerToys.Awake.exe"; std::wstring full_command_path = application_path + L" " + executable_args.data(); Logger::trace(L"PowerToys Awake launching with parameters: " + executable_args); diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj index 359ec50f46..6f0b840e5f 100644 --- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj +++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj @@ -26,7 +26,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.ColorPicker diff --git a/src/modules/colorPicker/ColorPicker/dllmain.cpp b/src/modules/colorPicker/ColorPicker/dllmain.cpp index 4978d4d551..229cddb1f6 100644 --- a/src/modules/colorPicker/ColorPicker/dllmain.cpp +++ b/src/modules/colorPicker/ColorPicker/dllmain.cpp @@ -117,7 +117,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\ColorPicker\\PowerToys.ColorPickerUI.exe"; + sei.lpFile = L"PowerToys.ColorPickerUI.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei)) diff --git a/src/modules/colorPicker/ColorPickerUI/Resources/colorPicker.cur b/src/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/colorPicker.cur similarity index 100% rename from src/modules/colorPicker/ColorPickerUI/Resources/colorPicker.cur rename to src/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/colorPicker.cur diff --git a/src/modules/colorPicker/ColorPickerUI/Resources/icon.ico b/src/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/icon.ico similarity index 100% rename from src/modules/colorPicker/ColorPickerUI/Resources/icon.ico rename to src/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/icon.ico diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index 14bdd57df1..ed1926d3ae 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -3,7 +3,7 @@ PowerToys.ColorPickerUI PowerToys ColorPicker - $(SolutionDir)$(Platform)\$(Configuration)\modules\ColorPicker + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -25,7 +25,9 @@ WinExe ColorPicker PowerToys.ColorPickerUI - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -41,7 +43,7 @@ true - Resources\icon.ico + Assets\ColorPicker\icon.ico en-US App.manifest @@ -61,10 +63,10 @@ SettingsSingleFileGenerator Settings.Designer.cs - + Always - + Always diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs index fb10b99b75..e438fee69d 100644 --- a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs +++ b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs @@ -205,7 +205,7 @@ namespace ColorPicker.Helpers private void ColorEditorViewModel_OpenSettingsRequested(object sender, EventArgs e) { - SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.ColorPicker); + SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.ColorPicker, false); } internal void RegisterWindowHandle(System.Windows.Interop.HwndSource hwndSource) diff --git a/src/modules/colorPicker/ColorPickerUI/Mouse/CursorManager.cs b/src/modules/colorPicker/ColorPickerUI/Mouse/CursorManager.cs index d8c93bf1da..4306503210 100644 --- a/src/modules/colorPicker/ColorPickerUI/Mouse/CursorManager.cs +++ b/src/modules/colorPicker/ColorPickerUI/Mouse/CursorManager.cs @@ -16,7 +16,7 @@ namespace ColorPicker.Mouse private const string IBeamRegistryName = "IBeam"; private const string CrosshairRegistryName = "Crosshair"; private const string HandRegistryName = "Hand"; - private const string ColorPickerCursorName = "Resources\\colorPicker.cur"; + private const string ColorPickerCursorName = "Assets\\ColorPicker\\colorPicker.cur"; private static string _originalArrowCursorPath; private static string _originalIBeamCursorPath; diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj index 3928e27d46..e9cf5ee42a 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -2,7 +2,9 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1} Microsoft.ColorPicker.UnitTests false @@ -12,7 +14,7 @@ - ..\..\..\..\$(Platform)\$(Configuration)\modules\ColorPicker\UnitTest-ColorPickerUI\ + ..\..\..\..\$(Platform)\$(Configuration)\tests\UnitTest-ColorPickerUI\ diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj index 23ed808cf9..29caf11f4a 100644 --- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj +++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj @@ -65,7 +65,6 @@ Application v143 - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ Unicode Spectre @@ -90,7 +89,7 @@ PowerToys.$(MSBuildProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ + ..\..\..\..\$(Platform)\$(Configuration)\ true diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp index 84e0d373b4..e7f45d34be 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp +++ b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp @@ -57,7 +57,7 @@ constexpr wchar_t* DisplayChangeTypeName (const DisplayChangeType type){ namespace NonLocalizable { const wchar_t ToolWindowClassName[] = L"SuperFancyZones"; - const wchar_t FZEditorExecutablePath[] = L"modules\\FancyZones\\PowerToys.FancyZonesEditor.exe"; + const wchar_t FZEditorExecutablePath[] = L"PowerToys.FancyZonesEditor.exe"; } struct FancyZones : public winrt::implements, public SettingsObserver diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj index 878d6f916d..ad923bfcb9 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj @@ -26,7 +26,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ + ..\..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj index 66e4707f56..1ed6f80ef2 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj +++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj @@ -23,7 +23,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.FancyZonesModuleInterface diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/dllmain.cpp b/src/modules/fancyzones/FancyZonesModuleInterface/dllmain.cpp index a9fe613b58..40d0aea08f 100644 --- a/src/modules/fancyzones/FancyZonesModuleInterface/dllmain.cpp +++ b/src/modules/fancyzones/FancyZonesModuleInterface/dllmain.cpp @@ -15,7 +15,7 @@ #include // Non-localizable -const std::wstring fancyZonesPath = L"modules\\FancyZones\\PowerToys.FancyZones.exe"; +const std::wstring fancyZonesPath = L"PowerToys.FancyZones.exe"; BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/) { diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj index d99d534ae0..f00a1e8c5d 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj @@ -8,7 +8,6 @@ UnitTests NativeUnitTestProject UnitTests-FancyZones - 10.0.19041.0 @@ -28,7 +27,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones\$(ProjectName)\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\$(ProjectName)\ diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index 06f630a98d..6c876344dd 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -11,7 +11,7 @@ false false true - $(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones + ..\..\..\..\..\$(Platform)\$(Configuration) true @@ -25,7 +25,9 @@ {5CCC8468-DEC8-4D36-99D4-5C891BEBD481} - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs index 63fc5990d9..89616f6b43 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs @@ -618,7 +618,7 @@ namespace FancyZonesEditor private void SettingsBtn_Click(object sender, RoutedEventArgs e) { - SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.FancyZones); + SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.FancyZones, false); } private void EditLayoutDialogTitle_Loaded(object sender, RoutedEventArgs e) diff --git a/src/modules/imageresizer/ImageResizerContextMenu/AppxManifest.xml b/src/modules/imageresizer/ImageResizerContextMenu/AppxManifest.xml index 55a48de6fc..12a9a7113e 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/AppxManifest.xml +++ b/src/modules/imageresizer/ImageResizerContextMenu/AppxManifest.xml @@ -15,7 +15,7 @@ PowerToys ImageResizer Context Menu Microsoft - Assets\storelogo.png + Assets\ImageResizer\storelogo.png true @@ -30,9 +30,9 @@ - - - + + + diff --git a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizer.ico b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/ImageResizer.ico similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/ImageResizer.ico rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/ImageResizer.ico diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/LargeTile.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/LargeTile.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/LargeTile.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/LargeTile.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/SmallTile.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/SmallTile.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/SmallTile.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/SmallTile.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/SplashScreen.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/SplashScreen.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/SplashScreen.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/SplashScreen.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/Square150x150Logo.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/Square150x150Logo.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/Square150x150Logo.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/Square150x150Logo.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/Square44x44Logo.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/Square44x44Logo.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/Square44x44Logo.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/Square44x44Logo.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/Wide310x150Logo.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/Wide310x150Logo.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/Wide310x150Logo.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/Wide310x150Logo.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/Assets/storelogo.png b/src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/storelogo.png similarity index 100% rename from src/modules/imageresizer/ImageResizerContextMenu/Assets/storelogo.png rename to src/modules/imageresizer/ImageResizerContextMenu/Assets/ImageResizer/storelogo.png diff --git a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj index 650bd37b57..10579e1e38 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj +++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj @@ -32,7 +32,9 @@ PowerToys.ImageResizerContextMenu - $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ + + $(SolutionDir)$(Platform)\$(Configuration)\TemporaryBuild\obj\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\ @@ -50,7 +52,7 @@ Source.def - del $(OutDir)*.msix /q + del $(OutDir)\ImageResizerContextMenuPackage.msix /q MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv @@ -74,7 +76,7 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nvSource.def - del $(OutDir)*.msix /q + del $(OutDir)\ImageResizerContextMenuPackage.msix /q MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv @@ -99,10 +101,7 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv - - - - + diff --git a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj.filters b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj.filters index 54229a2926..f21dc7f7f7 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj.filters +++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj.filters @@ -37,10 +37,7 @@ - - Resource Files - - + Resource Files diff --git a/src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp b/src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp index 26bf622520..83a53cd373 100644 --- a/src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp +++ b/src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp @@ -60,7 +60,7 @@ public: IFACEMETHODIMP GetIcon(_In_opt_ IShellItemArray*, _Outptr_result_nullonfailure_ PWSTR* icon) { std::wstring iconResourcePath = get_module_folderpath(g_hInst); - iconResourcePath += L"\\"; + iconResourcePath += L"\\Assets\\ImageResizer\\"; iconResourcePath += L"ImageResizer.ico"; return SHStrDup(iconResourcePath.c_str(), icon); } diff --git a/src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj b/src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj index 93350cf0db..cce1ca9bac 100644 --- a/src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj +++ b/src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj @@ -4,7 +4,6 @@ Win32Proj {18b3db45-4ffe-4d01-97d6-5223feee1853} ImageResizerLib - 10.0.19041.0 StaticLibrary @@ -29,7 +28,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj index 3cd6036484..2686657f39 100644 --- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj +++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj @@ -26,7 +26,7 @@ true - $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.ImageResizerExt diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj index 18dacef1ff..341bd6e8af 100644 --- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj +++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj @@ -2,15 +2,16 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8} Library Properties ImageResizer ImageResizer.Test $(Version).0 - $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\$(AssemblyName)\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\$(AssemblyName)\ diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj index fc3daa760a..484a17da8b 100644 --- a/src/modules/imageresizer/ui/ImageResizerUI.csproj +++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj @@ -3,7 +3,7 @@ PowerToys.ImageResizer - $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -24,9 +24,10 @@ WinExe ImageResizer PowerToys.ImageResizer - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\ diff --git a/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs b/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs index bead693b48..42b1b459a3 100644 --- a/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs +++ b/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs @@ -80,7 +80,7 @@ namespace ImageResizer.ViewModels public static void OpenSettings() { - SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.ImageResizer); + SettingsDeepLink.OpenSettings(SettingsDeepLink.SettingsWindow.ImageResizer, false); } private void HandleEnterKeyPress(KeyPressParams parameters) diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj index 7b6f6da07a..428583bc40 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj @@ -67,8 +67,7 @@ v143 - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\$(MSBuildProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ Unicode Spectre Application diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj index 1a2c475e8c..9ef1b6b55e 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj @@ -10,7 +10,7 @@ StaticLibrary - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ + ..\..\..\..\$(Platform)\$(Configuration)\ v143 diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj index 387a93198c..3ba28a2c07 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj @@ -25,7 +25,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\KeyboardManagerEditor\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\KeyboardManagerEditor\ diff --git a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj index ec288311c3..6989a31b7e 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj @@ -34,7 +34,7 @@ PowerToys.$(MSBuildProjectName) - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\$(ProjectName)\ diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj index 1817c5865d..3d749e3fc6 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj @@ -10,7 +10,7 @@ StaticLibrary - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ + ..\..\..\..\$(Platform)\$(Configuration)\ v143 diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj index 6db68dabb7..8df2dd3f98 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj @@ -26,7 +26,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\KeyboardManagerEngine\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\KeyboardManagerEngine\ diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj index 6af3e8565c..7819d3cdae 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj +++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj @@ -21,7 +21,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\KeyboardManager\ + ..\..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index ec081f5fdc..521af15089 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -25,7 +25,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.KeyboardManager diff --git a/src/modules/keyboardmanager/dll/dllmain.cpp b/src/modules/keyboardmanager/dll/dllmain.cpp index f97d1404f7..0f0ea94bee 100644 --- a/src/modules/keyboardmanager/dll/dllmain.cpp +++ b/src/modules/keyboardmanager/dll/dllmain.cpp @@ -127,7 +127,7 @@ public: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\KeyboardManager\\KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe"; + sei.lpFile = L"KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei) == false) diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 3c03e6e160..78b915c65c 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -10,12 +10,11 @@ Win32Proj Wox_Launcher Microsoft.Launcher - 10.0.19041.0 DynamicLibrary - $(SolutionDir)$(Platform)\$(Configuration)\modules\launcher\ + ..\..\..\..\$(Platform)\$(Configuration)\ v143 diff --git a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp index b692dd1daf..e140fb728e 100644 --- a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp +++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp @@ -246,7 +246,7 @@ public: std::wstring params; params += L" -powerToysPid " + std::to_wstring(powertoys_pid) + L" "; params += L"--started-from-runner "; - runExecutablePath += L"\\modules\\launcher\\PowerToys.PowerLauncher.exe"; + runExecutablePath += L"\\PowerToys.PowerLauncher.exe"; processStarted = RunNonElevatedFailsafe(runExecutablePath, params, modulePath).has_value(); } else @@ -259,7 +259,7 @@ public: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\launcher\\PowerToys.PowerLauncher.exe"; + sei.lpFile = L"PowerToys.PowerLauncher.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj index 646fca5b83..80e0ae406d 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\UnitConverter\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\UnitConverter\ diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj index 1ad625a6d5..857a171e25 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\VSCodeWorkspaces\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\VSCodeWorkspaces\ diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj index 0298e66f7a..6426a71a13 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj @@ -11,7 +11,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\ValueGenerator\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\ValueGenerator\ diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj index 7f2a57c50a..42880b5487 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WebSearch\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\WebSearch\ diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj index b6b99834a0..30f41c27da 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Folder\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Folder\ diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index 6742afc6b3..df67c0c565 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Indexer\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Indexer\ diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj index 9c2c7a0480..8d232b0745 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 false AppxManifests\developmentApp\AppxManifest.xml diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj index e5102dfa08..ceec7703b8 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj @@ -2,7 +2,9 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {FDB3555B-58EF-4AE6-B5F1-904719637AB4} Properties Microsoft.Plugin.Program @@ -13,7 +15,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Program\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Program\ diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj index 691856f9a6..70efa994a4 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Shell\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Shell\ diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj index 1d205d6721..a78f5ab4e6 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Uri\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Uri\ diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj index 13a4768ef3..5e732ba94e 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowWalker\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\WindowWalker\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj index cfe563edf8..07124150c5 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Calculator\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Calculator\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj index f3f1408595..417cc9033d 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj @@ -2,7 +2,9 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {212AD910-8488-4036-BE20-326931B75FB2} Properties Microsoft.PowerToys.Run.Plugin.History @@ -12,7 +14,7 @@ false false true - $(SolutionDir)\$(Platform)\$(Configuration)\modules\launcher\Plugins\History\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\History\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj index 6e611ea7af..ea27545bec 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj @@ -10,7 +10,7 @@ false true enable - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\OneNote\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\OneNote\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Components/Utility.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Components/Utility.cs index 7359eb32ac..85a60b94b8 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Components/Utility.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Components/Utility.cs @@ -79,7 +79,7 @@ namespace Microsoft.PowerToys.Run.Plugin.PowerToys.Components AcceleratorModifiers = ModifierKeys.Control | ModifierKeys.Shift, Action = _ => { - SettingsDeepLink.OpenSettings(settingsWindow.Value); + SettingsDeepLink.OpenSettings(settingsWindow.Value, false); return true; }, }); diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj index 34b66f1054..d55c416f4f 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj @@ -3,14 +3,16 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 Microsoft.PowerToys.Run.Plugin.PowerToys Microsoft.PowerToys.Run.Plugin.PowerToys $(Version).0 false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\PowerToys\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\PowerToys\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj index d9786b497d..f259ceab78 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj @@ -9,7 +9,7 @@ false enable true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Registry\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Registry\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj index 97ba348518..8db116c306 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj @@ -10,7 +10,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\Service\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\Service\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs index 0fdfe8e0d0..93c6758766 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Windows.Controls; -using ControlzEx.Standard; using ManagedCommon; using Microsoft.PowerToys.Run.Plugin.System.Components; using Microsoft.PowerToys.Run.Plugin.System.Properties; diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj index cac505b382..f58a67e29b 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\System\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\System\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj index 74c9655f3e..264ed425d0 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj @@ -12,7 +12,7 @@ false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\TimeDate\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\TimeDate\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj index 8df6b3cc05..d441af6c1c 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj @@ -13,7 +13,7 @@ true enable true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowsSettings\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\WindowsSettings\ diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj index 43df916a4e..c3ddb38751 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.UnitTests/Microsoft.Plugin.WindowsTerminal.UnitTests.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true false diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj index d14cd4ef06..64492e18e8 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj @@ -3,14 +3,16 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 Microsoft.PowerToys.Run.Plugin.WindowsTerminal Microsoft.PowerToys.Run.Plugin.WindowsTerminal $(Version).0 false false true - ..\..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\Plugins\WindowsTerminal\ + ..\..\..\..\..\$(Platform)\$(Configuration)\RunPlugins\WindowsTerminal\ diff --git a/src/modules/launcher/PowerLauncher/Images/RunAsset.ico b/src/modules/launcher/PowerLauncher/Assets/PowerLauncher/RunAsset.ico similarity index 100% rename from src/modules/launcher/PowerLauncher/Images/RunAsset.ico rename to src/modules/launcher/PowerLauncher/Assets/PowerLauncher/RunAsset.ico diff --git a/src/modules/launcher/PowerLauncher/Images/RunResource.ico b/src/modules/launcher/PowerLauncher/Assets/PowerLauncher/RunResource.ico similarity index 100% rename from src/modules/launcher/PowerLauncher/Images/RunResource.ico rename to src/modules/launcher/PowerLauncher/Assets/PowerLauncher/RunResource.ico diff --git a/src/modules/launcher/PowerLauncher/Images/app_error.dark.png b/src/modules/launcher/PowerLauncher/Assets/PowerLauncher/app_error.dark.png similarity index 100% rename from src/modules/launcher/PowerLauncher/Images/app_error.dark.png rename to src/modules/launcher/PowerLauncher/Assets/PowerLauncher/app_error.dark.png diff --git a/src/modules/launcher/PowerLauncher/Images/app_error.light.png b/src/modules/launcher/PowerLauncher/Assets/PowerLauncher/app_error.light.png similarity index 100% rename from src/modules/launcher/PowerLauncher/Images/app_error.light.png rename to src/modules/launcher/PowerLauncher/Assets/PowerLauncher/app_error.light.png diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 34e6d60727..5a0d7e780c 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -3,21 +3,23 @@ PowerToys.Run WinExe - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true true PowerLauncher.App - Images\RunResource.ico + Assets\PowerLauncher\RunResource.ico app.manifest win-x64;win-arm64 false false - uap10.0.18362 + uap10.0.19041 $(Version).0 Microsoft Corporation PowerToys PowerLauncher PowerToys.PowerLauncher - ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\ + ..\..\..\..\$(Platform)\$(Configuration) true true @@ -52,20 +54,16 @@ - - - - + + + - + PreserveNewest - - PreserveNewest - - + PreserveNewest @@ -88,6 +86,8 @@ + + @@ -109,7 +109,7 @@ - + PreserveNewest @@ -139,7 +139,7 @@ - + diff --git a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml index 0c628c50af..c0d655d21f 100644 --- a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\launcher + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration) win-$(Platform) true False diff --git a/src/modules/launcher/PowerLauncher/app.png b/src/modules/launcher/PowerLauncher/app.png deleted file mode 100644 index 131ce46fb0..0000000000 Binary files a/src/modules/launcher/PowerLauncher/app.png and /dev/null differ diff --git a/src/modules/launcher/Wox.Infrastructure/Storage/PluginJsonStorage`1.cs b/src/modules/launcher/Wox.Infrastructure/Storage/PluginJsonStorage`1.cs index 21f638aefb..d372615408 100644 --- a/src/modules/launcher/Wox.Infrastructure/Storage/PluginJsonStorage`1.cs +++ b/src/modules/launcher/Wox.Infrastructure/Storage/PluginJsonStorage`1.cs @@ -18,7 +18,7 @@ namespace Wox.Infrastructure.Storage // C# related, add python related below var dataType = typeof(T); var assemblyName = typeof(T).Assembly.GetName().Name; - DirectoryPath = Path.Combine(Constant.DataDirectory, DirectoryName, Constant.Plugins, assemblyName); + DirectoryPath = Path.Combine(Constant.DataDirectory, DirectoryName, Constant.PluginsDataStorage, assemblyName); Helper.ValidateDirectory(DirectoryPath); FilePath = Path.Combine(DirectoryPath, $"{dataType.Name}{FileSuffix}"); diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index efe9beb24e..e14c06dde1 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -12,7 +12,7 @@ $(Version).0 false false - ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxInfrastructure + ..\..\..\..\$(Platform)\$(Configuration)\WoxInfrastructure diff --git a/src/modules/launcher/Wox.Plugin/Constant.cs b/src/modules/launcher/Wox.Plugin/Constant.cs index 8f37b72fc7..18245bb6c2 100644 --- a/src/modules/launcher/Wox.Plugin/Constant.cs +++ b/src/modules/launcher/Wox.Plugin/Constant.cs @@ -32,7 +32,8 @@ namespace Wox.Plugin public const string ExeFileName = "PowerToys.PowerLauncher"; public const string ModuleLocation = "Microsoft\\PowerToys\\PowerToys Run"; - public const string Plugins = "Plugins"; + public const string Plugins = "RunPlugins"; + public const string PluginsDataStorage = "Plugins"; public const string PortableFolderName = "UserData"; private static readonly Assembly Assembly = Assembly.GetExecutingAssembly(); @@ -57,13 +58,13 @@ namespace Wox.Plugin } public static readonly string DataDirectory = DetermineDataDirectory(); - public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins); + public static readonly string PluginsDirectory = Path.Combine(DataDirectory, PluginsDataStorage); public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); public const string Issue = "https://aka.ms/powerToysReportBug"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly int ThumbnailSize = 64; - public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.dark.png"); - public static readonly string LightThemedErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.light.png"); + public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Assets", "PowerLauncher", "app_error.dark.png"); + public static readonly string LightThemedErrorIcon = Path.Combine(ProgramDirectory, "Assets", "PowerLauncher", "app_error.light.png"); } } diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index c08e738e99..daf9814fbd 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -13,7 +13,7 @@ false false true - ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxPlugin + ..\..\..\..\$(Platform)\$(Configuration)\WoxPlugin @@ -49,6 +49,8 @@ + + diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 013bb487f2..2ebd0ca951 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -2,7 +2,9 @@ - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {FF742965-9A80-41A5-B042-D6C7D3A21708} Library Properties @@ -11,7 +13,7 @@ $(Version).0 - ..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\WoxTest + ..\..\..\..\$(Platform)\$(Configuration)\tests\WoxTest diff --git a/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj b/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj index 8e1b3707b7..7d22363340 100644 --- a/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj +++ b/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj @@ -27,7 +27,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PastePlain\ + ..\..\..\..\$(Platform)\$(Configuration)\ diff --git a/src/modules/pasteplain/PastePlainModuleInterface/dllmain.cpp b/src/modules/pasteplain/PastePlainModuleInterface/dllmain.cpp index ec4f44c1c4..32da5d0f4b 100644 --- a/src/modules/pasteplain/PastePlainModuleInterface/dllmain.cpp +++ b/src/modules/pasteplain/PastePlainModuleInterface/dllmain.cpp @@ -119,7 +119,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\PastePlain\\PowerToys.PastePlain.exe"; + sei.lpFile = L"PowerToys.PastePlain.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei)) diff --git a/src/modules/peek/Peek.Common/Helpers/ReadableStringHelper.cs b/src/modules/peek/Peek.Common/Helpers/ReadableStringHelper.cs index 273f21e934..6fe8997984 100644 --- a/src/modules/peek/Peek.Common/Helpers/ReadableStringHelper.cs +++ b/src/modules/peek/Peek.Common/Helpers/ReadableStringHelper.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using Windows.ApplicationModel.Resources; namespace Peek.Common.Helpers { @@ -15,7 +14,7 @@ namespace Peek.Common.Helpers public static string BytesToReadableString(ulong bytes) { - var resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = ResourceLoaderInstance.ResourceLoader; List format = new List { resourceLoader.GetString("ReadableString_ByteAbbreviationFormat"), // "B" @@ -41,7 +40,7 @@ namespace Peek.Common.Helpers public static string FormatResourceString(string resourceId, object? args) { - var formatString = ResourceLoader.GetForViewIndependentUse()?.GetString(resourceId); + var formatString = ResourceLoaderInstance.ResourceLoader.GetString(resourceId); var formattedString = string.IsNullOrEmpty(formatString) ? string.Empty : string.Format(CultureInfo.InvariantCulture, formatString, args); return formattedString; @@ -49,7 +48,7 @@ namespace Peek.Common.Helpers public static string FormatResourceString(string resourceId, object? args0, object? args1) { - var formatString = ResourceLoader.GetForViewIndependentUse()?.GetString(resourceId); + var formatString = ResourceLoaderInstance.ResourceLoader.GetString(resourceId); var formattedString = string.IsNullOrEmpty(formatString) ? string.Empty : string.Format(CultureInfo.InvariantCulture, formatString, args0, args1); return formattedString; diff --git a/src/modules/peek/Peek.Common/Helpers/ResourceLoaderInstance.cs b/src/modules/peek/Peek.Common/Helpers/ResourceLoaderInstance.cs new file mode 100644 index 0000000000..07120296f4 --- /dev/null +++ b/src/modules/peek/Peek.Common/Helpers/ResourceLoaderInstance.cs @@ -0,0 +1,17 @@ +// 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 Microsoft.Windows.ApplicationModel.Resources; + +namespace Peek.Common.Helpers +{ + public static class ResourceLoaderInstance + { + public static ResourceLoader ResourceLoader { get; private set; } + + static ResourceLoaderInstance() + { + ResourceLoader = new Microsoft.Windows.ApplicationModel.Resources.ResourceLoader("PowerToys.Peek.UI.pri"); + } + } +} diff --git a/src/modules/peek/Peek.Common/Peek.Common.csproj b/src/modules/peek/Peek.Common/Peek.Common.csproj index d5dfb2da8a..46dd0a440a 100644 --- a/src/modules/peek/Peek.Common/Peek.Common.csproj +++ b/src/modules/peek/Peek.Common/Peek.Common.csproj @@ -1,8 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 10.0.19041.0 + 10.0.19041.0 Peek.Common win10-x86;win10-x64;win10-arm64 true diff --git a/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs b/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs index e287a338a6..ac1e80df85 100644 --- a/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs +++ b/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs @@ -20,7 +20,6 @@ using Peek.FilePreviewer.Models; using Peek.FilePreviewer.Previewers; using Peek.FilePreviewer.Previewers.Interfaces; using Peek.UI.Telemetry.Events; -using Windows.ApplicationModel.Resources; namespace Peek.FilePreviewer { @@ -55,7 +54,7 @@ namespace Peek.FilePreviewer private IPreviewer? previewer; [ObservableProperty] - private string imageInfoTooltip = ResourceLoader.GetForViewIndependentUse().GetString("PreviewTooltip_Blank"); + private string imageInfoTooltip = ResourceLoaderInstance.ResourceLoader.GetString("PreviewTooltip_Blank"); private CancellationTokenSource _cancellationTokenSource = new(); diff --git a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj index aee052e58d..02eb4c4dc3 100644 --- a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj +++ b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj @@ -1,8 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 10.0.19041.0 + 10.0.19041.0 Peek.FilePreviewer win10-x86;win10-x64;win10-arm64 true diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/ArchivePreviewer.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/ArchivePreviewer.cs index ccf8987b82..73e09f77f8 100644 --- a/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/ArchivePreviewer.cs +++ b/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/ArchivePreviewer.cs @@ -23,7 +23,6 @@ using Peek.FilePreviewer.Previewers.Interfaces; using SharpCompress.Archives; using SharpCompress.Common; using SharpCompress.Readers; -using Windows.ApplicationModel.Resources; namespace Peek.FilePreviewer.Previewers.Archives { @@ -105,9 +104,9 @@ namespace Peek.FilePreviewer.Previewers.Archives } _size = (ulong)new FileInfo(Item.Path).Length; // archive.TotalSize isn't accurate - DirectoryCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoader.GetForViewIndependentUse().GetString("Archive_Directory_Count"), _directoryCount); - FileCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoader.GetForViewIndependentUse().GetString("Archive_File_Count"), _fileCount); - SizeText = string.Format(CultureInfo.CurrentCulture, ResourceLoader.GetForViewIndependentUse().GetString("Archive_Size"), ReadableStringHelper.BytesToReadableString(_size), ReadableStringHelper.BytesToReadableString(_extractedSize)); + DirectoryCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Archive_Directory_Count"), _directoryCount); + FileCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Archive_File_Count"), _fileCount); + SizeText = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Archive_Size"), ReadableStringHelper.BytesToReadableString(_size), ReadableStringHelper.BytesToReadableString(_extractedSize)); State = PreviewState.Loaded; } diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/UnsupportedFilePreviewer/UnsupportedFilePreviewer.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/UnsupportedFilePreviewer/UnsupportedFilePreviewer.cs index 9a45b85351..154f6f36e9 100644 --- a/src/modules/peek/Peek.FilePreviewer/Previewers/UnsupportedFilePreviewer/UnsupportedFilePreviewer.cs +++ b/src/modules/peek/Peek.FilePreviewer/Previewers/UnsupportedFilePreviewer/UnsupportedFilePreviewer.cs @@ -105,7 +105,7 @@ namespace Peek.FilePreviewer.Previewers isIconValid = iconBitmap != null; - Preview.IconPreview = iconBitmap ?? new SvgImageSource(new Uri("ms-appx:///Assets/DefaultFileIcon.svg")); + Preview.IconPreview = iconBitmap ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg")); }); }); diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-100.png b/src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-100.png similarity index 100% rename from src/modules/peek/Peek.UI/Assets/AppList.scale-100.png rename to src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-100.png diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-125.png b/src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-125.png similarity index 100% rename from src/modules/peek/Peek.UI/Assets/AppList.scale-125.png rename to src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-125.png diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-150.png b/src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-150.png similarity index 100% rename from src/modules/peek/Peek.UI/Assets/AppList.scale-150.png rename to src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-150.png diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-200.png b/src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-200.png similarity index 100% rename from src/modules/peek/Peek.UI/Assets/AppList.scale-200.png rename to src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-200.png diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-400.png b/src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-400.png similarity index 100% rename from src/modules/peek/Peek.UI/Assets/AppList.scale-400.png rename to src/modules/peek/Peek.UI/Assets/Peek/AppList.scale-400.png diff --git a/src/modules/peek/Peek.UI/Assets/DefaultFileIcon.svg b/src/modules/peek/Peek.UI/Assets/Peek/DefaultFileIcon.svg similarity index 100% rename from src/modules/peek/Peek.UI/Assets/DefaultFileIcon.svg rename to src/modules/peek/Peek.UI/Assets/Peek/DefaultFileIcon.svg diff --git a/src/modules/peek/Peek.UI/Assets/Icon.ico b/src/modules/peek/Peek.UI/Assets/Peek/Icon.ico similarity index 100% rename from src/modules/peek/Peek.UI/Assets/Icon.ico rename to src/modules/peek/Peek.UI/Assets/Peek/Icon.ico diff --git a/src/modules/peek/Peek.UI/Package.appxmanifest b/src/modules/peek/Peek.UI/Package.appxmanifest index 9116adec94..f69368afc7 100644 --- a/src/modules/peek/Peek.UI/Package.appxmanifest +++ b/src/modules/peek/Peek.UI/Package.appxmanifest @@ -14,7 +14,7 @@ Peek.UI sachaple - Assets\StoreLogo.png + Assets\Peek\StoreLogo.png @@ -34,10 +34,10 @@ DisplayName="Peek.UI" Description="Peek.UI" BackgroundColor="transparent" - Square150x150Logo="Assets\Square150x150Logo.png" - Square44x44Logo="Assets\Square44x44Logo.png"> - - + Square150x150Logo="Assets\Peek\Square150x150Logo.png" + Square44x44Logo="Assets\Peek\Square44x44Logo.png"> + + diff --git a/src/modules/peek/Peek.UI/Peek.UI.csproj b/src/modules/peek/Peek.UI/Peek.UI.csproj index f0d00a70e4..1c8a06d834 100644 --- a/src/modules/peek/Peek.UI/Peek.UI.csproj +++ b/src/modules/peek/Peek.UI/Peek.UI.csproj @@ -6,9 +6,10 @@ PowerToys Peek UI Peek.UI WinExe - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 10.0.19041.0 - ..\..\..\..\$(Platform)\$(Configuration)\modules\Peek\ + 10.0.19041.0 + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps app.manifest x86;x64;ARM64 win10-x86;win10-x64;win10-arm64 @@ -21,10 +22,19 @@ true 10.0.19041.0 Enable - Assets\Icon.ico - true + Assets\Peek\Icon.ico + + PowerToys.Peek.UI.pri + true - + + + + + + + + win10-x64 @@ -41,14 +51,14 @@ - + - - - - - + + + + + @@ -103,7 +113,7 @@ - + diff --git a/src/modules/peek/Peek.UI/App.xaml b/src/modules/peek/Peek.UI/PeekXAML/App.xaml similarity index 100% rename from src/modules/peek/Peek.UI/App.xaml rename to src/modules/peek/Peek.UI/PeekXAML/App.xaml diff --git a/src/modules/peek/Peek.UI/App.xaml.cs b/src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs similarity index 100% rename from src/modules/peek/Peek.UI/App.xaml.cs rename to src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs diff --git a/src/modules/peek/Peek.UI/MainWindow.xaml b/src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml similarity index 100% rename from src/modules/peek/Peek.UI/MainWindow.xaml rename to src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml diff --git a/src/modules/peek/Peek.UI/MainWindow.xaml.cs b/src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs similarity index 100% rename from src/modules/peek/Peek.UI/MainWindow.xaml.cs rename to src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs diff --git a/src/modules/peek/Peek.UI/Views/TitleBar.xaml b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml similarity index 99% rename from src/modules/peek/Peek.UI/Views/TitleBar.xaml rename to src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml index a028ff528b..8b6e01280c 100644 --- a/src/modules/peek/Peek.UI/Views/TitleBar.xaml +++ b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml @@ -40,7 +40,7 @@ Height="24" HorizontalAlignment="Center" VerticalAlignment="Center" - Source="../Assets/AppList.scale-400.png" + Source="../../Assets/Peek/AppList.scale-400.png" Stretch="UniformToFill" /> 1) { - string fileCountTextFormat = ResourceLoader.GetForViewIndependentUse().GetString("AppTitle_FileCounts_Text"); + string fileCountTextFormat = ResourceLoaderInstance.ResourceLoader.GetString("AppTitle_FileCounts_Text"); FileCountText = string.Format(CultureInfo.InvariantCulture, fileCountTextFormat, FileIndex + 1, NumberOfFiles); } } @@ -277,10 +277,10 @@ namespace Peek.UI.Views // Update the name of default app to launch DefaultAppName = DefaultAppHelper.TryGetDefaultAppName(Item.Extension); - string openWithAppTextFormat = ResourceLoader.GetForViewIndependentUse().GetString("LaunchAppButton_OpenWithApp_Text"); + string openWithAppTextFormat = ResourceLoaderInstance.ResourceLoader.GetString("LaunchAppButton_OpenWithApp_Text"); OpenWithAppText = string.Format(CultureInfo.InvariantCulture, openWithAppTextFormat, DefaultAppName); - string openWithAppToolTipFormat = ResourceLoader.GetForViewIndependentUse().GetString("LaunchAppButton_OpenWithApp_ToolTip"); + string openWithAppToolTipFormat = ResourceLoaderInstance.ResourceLoader.GetString("LaunchAppButton_OpenWithApp_ToolTip"); OpenWithAppToolTip = string.Format(CultureInfo.InvariantCulture, openWithAppToolTipFormat, DefaultAppName); } } diff --git a/src/modules/peek/peek/dllmain.cpp b/src/modules/peek/peek/dllmain.cpp index 809828c600..d4874dee3f 100644 --- a/src/modules/peek/peek/dllmain.cpp +++ b/src/modules/peek/peek/dllmain.cpp @@ -283,7 +283,7 @@ private: Logger::trace("Starting Peek non elevated from elevated process"); const auto modulePath = get_module_folderpath(); std::wstring runExecutablePath = modulePath; - runExecutablePath += L"\\modules\\Peek\\PowerToys.Peek.UI.exe"; + runExecutablePath += L"\\WinUI3Apps\\PowerToys.Peek.UI.exe"; std::optional processStartedInfo = RunNonElevatedFailsafe(runExecutablePath, executable_args, modulePath, PROCESS_QUERY_INFORMATION | SYNCHRONIZE | PROCESS_TERMINATE); if (processStartedInfo.has_value()) { @@ -301,7 +301,7 @@ private: sei.fMask = { SEE_MASK_NOCLOSEPROCESS }; sei.lpVerb = L"open"; - sei.lpFile = L"modules\\Peek\\PowerToys.Peek.UI.exe"; + sei.lpFile = L"WinUI3Apps\\PowerToys.Peek.UI.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); diff --git a/src/modules/peek/peek/peek.vcxproj b/src/modules/peek/peek/peek.vcxproj index 3517af8230..442a3faed3 100644 --- a/src/modules/peek/peek/peek.vcxproj +++ b/src/modules/peek/peek/peek.vcxproj @@ -6,7 +6,6 @@ {a1425b53-3d61-4679-8623-e64a0d3d0a48} Win32Proj peek - 10.0.18362.0 Peek @@ -24,7 +23,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ PowerToys.Peek diff --git a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj index 49220b81a6..a3c1524fc1 100644 --- a/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj +++ b/src/modules/poweraccent/PowerAccent.Core/PowerAccent.Core.csproj @@ -1,7 +1,9 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 win-x64;win-arm64 enable disable diff --git a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj index 65e002bfd5..b459272213 100644 --- a/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj +++ b/src/modules/poweraccent/PowerAccent.UI/PowerAccent.UI.csproj @@ -2,7 +2,9 @@ WinExe - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 win-x64;win-arm64 disable true @@ -11,7 +13,7 @@ PowerToys.PowerAccent True PowerAccent.UI.Program - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerAccent + ..\..\..\..\$(Platform)\$(Configuration) false false true diff --git a/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj b/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj index 96b47ff982..06f86e5967 100644 --- a/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj +++ b/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj @@ -15,8 +15,6 @@ false Windows Store 10.0 - 10.0.19041.0 - 10.0.17134.0 @@ -48,7 +46,7 @@ PowerToys.PowerAccentKeyboardService - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerAccent\ + ..\..\..\..\$(Platform)\$(Configuration)\ @@ -57,8 +55,6 @@ $(IntDir)pch.pch Level4 %(AdditionalOptions) /bigobj - - /DWINRT_NO_MAKE_DETECTION %(AdditionalOptions) _WINRT_DLL;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) ../../..;%(AdditionalIncludeDirectories) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) diff --git a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj index 11d0844d3a..c7f0ddfb0d 100644 --- a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj +++ b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj @@ -7,7 +7,6 @@ Win32Proj PowerAccent PowerAccentModuleInterface - 10.0.19041.0 @@ -23,7 +22,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerAccent\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/poweraccent/PowerAccentModuleInterface/dllmain.cpp b/src/modules/poweraccent/PowerAccentModuleInterface/dllmain.cpp index 0427a5d674..d726166c41 100644 --- a/src/modules/poweraccent/PowerAccentModuleInterface/dllmain.cpp +++ b/src/modules/poweraccent/PowerAccentModuleInterface/dllmain.cpp @@ -60,7 +60,7 @@ private: unsigned long powertoys_pid = GetCurrentProcessId(); std::wstring executable_args = L"" + std::to_wstring(powertoys_pid); - std::wstring application_path = L"modules\\PowerAccent\\PowerToys.PowerAccent.exe"; + std::wstring application_path = L"PowerToys.PowerAccent.exe"; std::wstring full_command_path = application_path + L" " + executable_args.data(); Logger::trace(L"PowerToys QuickAccent launching: " + full_command_path); diff --git a/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml b/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml index d3325dc6e7..a2526bde77 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml +++ b/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml @@ -15,7 +15,7 @@ PowerToys PowerRename Context Menu Microsoft - Assets\storelogo.png + Assets\PowerRename\storelogo.png true @@ -30,9 +30,9 @@ - - - + + + diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/LargeTile.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/LargeTile.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/LargeTile.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/LargeTile.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameUI.ico b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/PowerRenameUI.ico similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/PowerRenameUI.ico rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/PowerRenameUI.ico diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/SmallTile.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/SmallTile.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/SmallTile.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/SmallTile.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/SplashScreen.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/SplashScreen.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/SplashScreen.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/SplashScreen.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/Square150x150Logo.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/Square150x150Logo.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/Square150x150Logo.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/Square150x150Logo.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/Square44x44Logo.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/Square44x44Logo.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/Square44x44Logo.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/Square44x44Logo.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/Wide310x150Logo.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/Wide310x150Logo.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/Wide310x150Logo.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/Wide310x150Logo.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/Assets/storelogo.png b/src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/storelogo.png similarity index 100% rename from src/modules/powerrename/PowerRenameContextMenu/Assets/storelogo.png rename to src/modules/powerrename/PowerRenameContextMenu/Assets/PowerRename/storelogo.png diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj index ac5ab84b67..587261dd08 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj +++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj @@ -32,7 +32,9 @@ PowerToys.PowerRenameContextMenu - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + + $(SolutionDir)$(Platform)\$(Configuration)\TemporaryBuild\obj\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ @@ -51,7 +53,7 @@ Source.def - del $(OutDir)*.msix /q + del $(OutDir)\PowerRenameContextMenuPackage.msix /q MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv @@ -76,7 +78,7 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nvSource.def - del $(OutDir)*.msix /q + del $(OutDir)\PowerRenameContextMenuPackage.msix /q MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv @@ -98,10 +100,7 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv - - - - + diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj.filters b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj.filters index ff71354f32..704ecb00cf 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj.filters +++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj.filters @@ -35,7 +35,7 @@ - + Resource Files @@ -45,28 +45,28 @@ - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files - + Resource Files diff --git a/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp b/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp index 028dc2c31b..f372907ab6 100644 --- a/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp +++ b/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp @@ -72,7 +72,7 @@ public: } std::wstring iconResourcePath = get_module_folderpath(g_hInst); - iconResourcePath += L"\\"; + iconResourcePath += L"\\Assets\\PowerRename\\"; iconResourcePath += L"PowerRenameUI.ico"; return SHStrDup(iconResourcePath.c_str(), icon); } diff --git a/src/modules/powerrename/PowerRenameUILib/Assets/file.png b/src/modules/powerrename/PowerRenameUILib/Assets/PowerRename/file.png similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/Assets/file.png rename to src/modules/powerrename/PowerRenameUILib/Assets/PowerRename/file.png diff --git a/src/modules/powerrename/PowerRenameUILib/Assets/folder.png b/src/modules/powerrename/PowerRenameUILib/Assets/PowerRename/folder.png similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/Assets/folder.png rename to src/modules/powerrename/PowerRenameUILib/Assets/PowerRename/folder.png diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItemViewModel.cpp b/src/modules/powerrename/PowerRenameUILib/ExplorerItemViewModel.cpp index 5b315ed144..73885f7c11 100644 --- a/src/modules/powerrename/PowerRenameUILib/ExplorerItemViewModel.cpp +++ b/src/modules/powerrename/PowerRenameUILib/ExplorerItemViewModel.cpp @@ -14,8 +14,8 @@ extern std::function g_itemToggledCallback; namespace { - const wchar_t fileImagePath[] = L"ms-appx:///Assets/file.png"; - const wchar_t folderImagePath[] = L"ms-appx:///Assets/folder.png"; + const wchar_t fileImagePath[] = L"ms-appx:///Assets/PowerRename/file.png"; + const wchar_t folderImagePath[] = L"ms-appx:///Assets/PowerRename/folder.png"; } namespace winrt::PowerRenameUI::implementation diff --git a/src/modules/powerrename/PowerRenameUILib/Package.appxmanifest b/src/modules/powerrename/PowerRenameUILib/Package.appxmanifest index 5d617978a7..a228c27ed3 100644 --- a/src/modules/powerrename/PowerRenameUILib/Package.appxmanifest +++ b/src/modules/powerrename/PowerRenameUILib/Package.appxmanifest @@ -14,7 +14,7 @@ PowerRenameUI Microsoft Corporation - Assets\StoreLogo.png + Assets\PowerRename\StoreLogo.png @@ -34,10 +34,10 @@ DisplayName="PowerRenameUI" Description="PowerRenameUI" BackgroundColor="transparent" - Square150x150Logo="Assets\Square150x150Logo.png" - Square44x44Logo="Assets\Square44x44Logo.png"> - - + Square150x150Logo="Assets\PowerRename\Square150x150Logo.png" + Square44x44Logo="Assets\PowerRename\Square44x44Logo.png"> + + diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj index 7be86b6f99..f704020d80 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj @@ -22,11 +22,11 @@ None Windows Store 10.0 - 10.0.19041.0 - 10.0.17763.0 true true true + + PowerToys.PowerRename.pri @@ -53,7 +53,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ @@ -62,7 +62,8 @@ $(IntDir)pch.pch Level4 %(AdditionalOptions) /bigobj - $(ProjectDir)..\..\..\common\Telemetry;$(ProjectDir)..\..\..\;$(ProjectDir)..\lib;%(AdditionalIncludeDirectories) + + $(ProjectDir)\Generated Files\PowerRenameXAML;$(ProjectDir)..\..\..\common\Telemetry;$(ProjectDir)..\..\..\;$(ProjectDir)..\lib;%(AdditionalIncludeDirectories) @@ -87,8 +88,8 @@ - - ExplorerItem.xaml + + PowerRenameXAML\ExplorerItem.xaml Code @@ -103,24 +104,24 @@ PatternSnippet.idl - - App.xaml + + PowerRenameXAML\App.xaml - - MainWindow.xaml + + PowerRenameXAML\MainWindow.xaml - - + + Designer - + - - ExplorerItem.xaml + + PowerRenameXAML\ExplorerItem.xaml Code @@ -137,21 +138,21 @@ Create - - App.xaml + + PowerRenameXAML\App.xaml - - MainWindow.xaml + + PowerRenameXAML\MainWindow.xaml - + Code - App.xaml + PowerRenameXAML\App.xaml - - ExplorerItem.xaml + + PowerRenameXAML\ExplorerItem.xaml Code @@ -160,9 +161,9 @@ Designer - + Code - MainWindow.xaml + PowerRenameXAML\MainWindow.xaml @@ -176,8 +177,8 @@ - - + + Always diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj.filters b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj.filters index fc0351720d..47372f3928 100644 --- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj.filters +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj.filters @@ -1,17 +1,29 @@  - + + PowerRenameXAML + - - + + PowerRenameXAML + + + PowerRenameXAML + - - + + PowerRenameXAML + + + PowerRenameXAML + - + + PowerRenameXAML + @@ -30,6 +42,9 @@ {27718999-c175-450a-861c-89f911e16a88} + + {B997F68E-02BE-4493-B417-9EC3ED2AEBE5} + @@ -38,10 +53,10 @@ - + Assets - + Assets diff --git a/src/modules/powerrename/PowerRenameUILib/App.idl b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.idl similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/App.idl rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.idl diff --git a/src/modules/powerrename/PowerRenameUILib/App.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/App.xaml rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml diff --git a/src/modules/powerrename/PowerRenameUILib/App.xaml.cpp b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/App.xaml.cpp rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp diff --git a/src/modules/powerrename/PowerRenameUILib/App.xaml.h b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.h similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/App.xaml.h rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.h diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.cpp similarity index 96% rename from src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.cpp index f30bb001cb..1273de7b24 100644 --- a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.cpp @@ -10,8 +10,8 @@ using namespace Microsoft::Windows::ApplicationModel::Resources; namespace { - const wchar_t fileImagePath[] = L"ms-appx:///Assets/file.png"; - const wchar_t folderImagePath[] = L"ms-appx:///Assets/folder.png"; + const wchar_t fileImagePath[] = L"ms-appx:///Assets/PowerRename/file.png"; + const wchar_t folderImagePath[] = L"ms-appx:///Assets/PowerRename/folder.png"; std::wstring PowerRenameItemRenameStatusToString(PowerRenameItemRenameStatus status) { @@ -201,7 +201,7 @@ namespace winrt::PowerRenameUI::implementation std::wstring ExplorerItem::StateToErrorMessage() { static auto factory = winrt::get_activation_factory(); - static ResourceManager manager = factory.CreateInstance(L"resources.pri"); + static ResourceManager manager = factory.CreateInstance(L"PowerToys.PowerRename.pri"); static auto invalid_char_error = manager.MainResourceMap().GetValue(L"Resources/ErrorMessage_InvalidChar").ValueAsString(); static auto name_too_long_error = manager.MainResourceMap().GetValue(L"Resources/ErrorMessage_FileNameTooLong").ValueAsString(); diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.h b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.h similarity index 98% rename from src/modules/powerrename/PowerRenameUILib/ExplorerItem.h rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.h index 68f94edbaa..69dbe4a517 100644 --- a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.h +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.h @@ -6,7 +6,7 @@ #include "winrt/Microsoft.UI.Xaml.Controls.Primitives.h" #include "ExplorerItem.g.h" #include "PowerRenameInterfaces.h" -#include "Utils.h" +#include "..\Utils.h" namespace winrt::PowerRenameUI::implementation { diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.idl b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.idl similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/ExplorerItem.idl rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.idl diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.xaml similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/ExplorerItem.xaml rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/ExplorerItem.xaml diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.idl b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl similarity index 94% rename from src/modules/powerrename/PowerRenameUILib/MainWindow.idl rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl index 50c2754e22..c488560308 100644 --- a/src/modules/powerrename/PowerRenameUILib/MainWindow.idl +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl @@ -1,4 +1,4 @@ -import "ExplorerItem.idl"; +import "PowerRenameXAML\ExplorerItem.idl"; import "ExplorerItemsSource.idl"; import "PatternSnippet.idl"; diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml similarity index 99% rename from src/modules/powerrename/PowerRenameUILib/MainWindow.xaml rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml index dc47c10b27..6b75375566 100644 --- a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml +++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml @@ -56,7 +56,7 @@ Width="16" Margin="4,0,0,0" HorizontalAlignment="Left" - Source="ms-appx:///Assets/file.png" /> + Source="ms-appx:///Assets/PowerRename/file.png" /> (); auto factory = winrt::get_activation_factory(); - ResourceManager manager = factory.CreateInstance(L"resources.pri"); + ResourceManager manager = factory.CreateInstance(L"PowerToys.PowerRename.pri"); m_searchRegExShortcuts.Append(winrt::make(L".", manager.MainResourceMap().GetValue(L"Resources/RegExCheatSheet_MatchAny").ValueAsString())); m_searchRegExShortcuts.Append(winrt::make(L"\\d", manager.MainResourceMap().GetValue(L"Resources/RegExCheatSheet_MatchDigit").ValueAsString())); @@ -853,7 +853,7 @@ namespace winrt::PowerRenameUI::implementation HRESULT MainWindow::OpenSettingsApp() { std::wstring path = get_module_folderpath(g_hostHInst); - path += L"\\..\\..\\PowerToys.exe"; + path += L"\\..\\PowerToys.exe"; std::wstring openSettings = L"--open-settings=PowerRename"; diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml.h b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.h similarity index 100% rename from src/modules/powerrename/PowerRenameUILib/MainWindow.xaml.h rename to src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.h diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj index e941c1e462..b29de8d529 100644 --- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj +++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj @@ -8,13 +8,12 @@ 15.0 {B25AC7A5-FB9F-4789-B392-D5C85E948670} PowerRenameExt - 10.0.19041.0 DynamicLibrary PowerToys.PowerRenameExt - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ v143 diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj index cee81bf2cb..be76c5f5ab 100644 --- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj +++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj @@ -21,7 +21,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj index e28ecc5236..770c995568 100644 --- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj +++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj @@ -24,7 +24,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + ..\..\..\..\$(Platform)\$(Configuration)\tests\PowerRename\ @@ -32,7 +32,7 @@ WIN32;_WINDOWS;%(PreprocessorDefinitions) - $(OutDir)PowerRenameLib.lib;Pathcch.lib;comctl32.lib;shlwapi.lib;shcore.lib;%(AdditionalDependencies) + $(OutDir)\..\..\WinUI3Apps\PowerRenameLib.lib;Pathcch.lib;comctl32.lib;shlwapi.lib;shcore.lib;%(AdditionalDependencies) diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj index 5dd652fcea..0598fb77e6 100644 --- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj +++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj @@ -24,7 +24,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\ + ..\..\..\..\$(Platform)\$(Configuration)\tests\PowerRename\ @@ -34,7 +34,7 @@ $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - $(OutDir)PowerRenameLib.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies) + $(OutDir)\..\..\WinUI3Apps\PowerRenameLib.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies) diff --git a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj index 0e6af4e9d0..2f49a7f54a 100644 --- a/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj +++ b/src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj @@ -5,8 +5,8 @@ PowerToys.GcodePreviewHandler PowerToys GcodePreviewHandler PowerToys GcodePreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\GcodePreviewPaneDocumentation.xml - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\GcodePreviewPaneDocumentation.xml + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -26,7 +26,9 @@ {805306FF-A562-4415-8DEF-E493BDC45918} Microsoft.PowerToys.PreviewHandler.Gcode - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 diff --git a/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj b/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj index df0afaaaf9..c0158378bc 100644 --- a/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj +++ b/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {5a5dd09d-723a-44d3-8f2b-293584c3d731} GcodePreviewHandlerCpp - 10.0.19041.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj index 9c3c2e3ff5..e75a48227d 100644 --- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj @@ -7,10 +7,12 @@ PowerToys.GcodeThumbnailProvider PowerToys.GcodeThumbnailProvider PowerToys GcodePreviewHandler - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true PowerToys GcodePreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration) false false true diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj index 59a2db3c48..e549931c8c 100644 --- a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {56cc2f10-6e41-453d-be16-c593a5e58482} GcodeThumbnailProviderCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj index b1b6da2ccd..f9ff83bd76 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj @@ -5,14 +5,16 @@ PowerToys.MarkdownPreviewHandler PowerToys MarkdownPreviewHandler PowerToys MarkdownPreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\MarkdownPreviewPaneDocumentation.xml - ..\..\..\..\$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\MarkdownPreviewPaneDocumentation.xml + ..\..\..\..\$(Platform)\$(Configuration) false false true true win10-x64;win10-arm64 - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true diff --git a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index d8a1a0ab2d..4e1785e537 100644 --- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\FileExplorerPreview + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration) win10-$(Platform) true False diff --git a/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj b/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj index c72913f725..f132c2a1fd 100644 --- a/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj +++ b/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj @@ -9,7 +9,6 @@ Win32Proj {ed9a1ac6-aeb0-4569-a6e9-e1696182b545} MarkdownPreviewHandlerCpp - 10.0.19041.0 @@ -35,7 +34,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ true diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj index 5668f2fa2e..29969551e5 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj @@ -5,7 +5,7 @@ PowerToys.MonacoPreviewHandler PowerToys MonacoPreviewHandler PowerToys MonacoPreviewHandler - ..\..\..\..\$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -26,7 +26,9 @@ Microsoft.PowerToys.PreviewHandler.Monaco - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 PowerToys.MonacoPreviewHandler diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs index 2be1b0117a..f137d67883 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs +++ b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs @@ -149,7 +149,7 @@ namespace Microsoft.PowerToys.PreviewHandler.Monaco { await _webView.EnsureCoreWebView2Async(_webView2Environment).ConfigureAwait(true); - _webView.CoreWebView2.SetVirtualHostNameToFolderMapping(FilePreviewCommon.MonacoHelper.VirtualHostName, Settings.AssemblyDirectory, CoreWebView2HostResourceAccessKind.Allow); + _webView.CoreWebView2.SetVirtualHostNameToFolderMapping(FilePreviewCommon.MonacoHelper.VirtualHostName, FilePreviewCommon.MonacoHelper.MonacoDirectory, CoreWebView2HostResourceAccessKind.Allow); Logger.LogInfo("Navigates to string of HTML file"); diff --git a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index d8a1a0ab2d..4e1785e537 100644 --- a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\FileExplorerPreview + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration) win10-$(Platform) true False diff --git a/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj b/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj index 49498831f5..c1287606c9 100644 --- a/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj +++ b/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {b3e869c4-8210-4ebd-a621-ff4c4afcbfa9} MonacoPreviewHandlerCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj index 8092dae64a..89f28c5604 100644 --- a/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj +++ b/src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj @@ -6,8 +6,8 @@ PowerToys.PdfPreviewHandler PowerToys PdfPreviewHandler PowerToys PdfPreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PdfPreviewPaneDocumentation.xml - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\PdfPreviewPaneDocumentation.xml + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -26,7 +26,9 @@ {69E1EE8D-143A-4060-9129-4658ACF14AAF} Microsoft.PowerToys.PreviewHandler.Pdf - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 PowerToys.PdfPreviewHandler diff --git a/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj b/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj index 2eca59b53a..fd12dc27d7 100644 --- a/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj +++ b/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {54f7c616-fd41-4e62-bff9-015686914f4d} PdfPreviewHandlerCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj index b3b5be4bc8..2d3f00b0a9 100644 --- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj @@ -7,10 +7,12 @@ PowerToys.PdfThumbnailProvider PowerToys.PdfThumbnailProvider PowerToys PdfPreviewHandler - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true PowerToys PdfPreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration) false false true diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj index 7690364542..f36f862484 100644 --- a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {ca5518ed-0458-4b09-8f53-4122b9888655} PdfThumbnailProviderCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj index ab2cb359a8..89978b13f8 100644 --- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj +++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj @@ -7,10 +7,12 @@ PowerToys.StlThumbnailProvider PowerToys.StlThumbnailProvider PowerToys StlPreviewHandler - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true PowerToys StlPreviewHandler - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration) false false true diff --git a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj index 1d8956cb9f..0a230cdff9 100644 --- a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {d6dcc3ae-18c0-488a-b978-baa9e3cff09d} StlThumbnailProviderCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml index d8a1a0ab2d..4e1785e537 100644 --- a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\FileExplorerPreview + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration) win10-$(Platform) true False diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj index c8b69ea1ad..a4788401d4 100644 --- a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj +++ b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj @@ -6,14 +6,16 @@ PowerToys.SvgPreviewHandler PowerToys SvgPreviewHandler PowerToys SvgPreviewHandler - ..\..\..\..\$(Platform)\$(Configuration)\modules\FileExplorerPreview\ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\SvgPreviewHandler.xml + ..\..\..\..\$(Platform)\$(Configuration) + ..\..\..\..\$(Platform)\$(Configuration)\SvgPreviewHandler.xml false false true true win10-x64;win10-arm64 - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true diff --git a/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj b/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj index 5feea9530b..7ce4091fcb 100644 --- a/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj +++ b/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {143f13e3-d2e3-4d83-b035-356612d99956} SvgPreviewHandlerCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml index d8a1a0ab2d..4e1785e537 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\modules\FileExplorerPreview + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration) win10-$(Platform) true False diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj index 8fa55a81d1..8a2602dda2 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj @@ -7,10 +7,12 @@ PowerToys.SvgThumbnailProvider PowerToys.SvgThumbnailProvider PowerToys SvgPreviewHandler - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 true PowerToys SvgPreviewHandler - ..\..\..\..\$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration) true false false diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj index 060e178785..20a5a7c769 100644 --- a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj +++ b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj @@ -6,7 +6,6 @@ Win32Proj {2bbc9e33-21ec-401c-84da-bb6590a9b2aa} SvgThumbnailProviderCpp - 10.0 @@ -32,7 +31,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.$(ProjectName) diff --git a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj index eaa97434a5..129a1c34da 100644 --- a/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-GcodePreviewHandler/UnitTests-GcodePreviewHandler.csproj @@ -9,7 +9,9 @@ {FCF3E52D-B80A-4FC3-98FD-6391354F0EE3} PdfPreviewHandlerUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj index e44437cbfa..bf4331375b 100644 --- a/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-GcodeThumbnailProvider/UnitTests-GcodeThumbnailProvider.csproj @@ -9,7 +9,9 @@ {133281D8-1BCE-4D07-B31E-796612A9609E} GcodeThumbnailProviderUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj index 1331df0748..57a81b4bd1 100644 --- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj @@ -10,7 +10,9 @@ {A2B51B8B-8F90-424E-BC97-F9AB7D76CA1A} PreviewPaneUnitTests PreviewPaneUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj index 24bbef6441..ca5e98ec47 100644 --- a/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-PdfPreviewHandler/UnitTests-PdfPreviewHandler.csproj @@ -9,7 +9,9 @@ {ECC20689-002A-4354-95A6-B58DF089C6FF} PdfPreviewHandlerUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj index d6d2e7c397..7e71706fc7 100644 --- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/UnitTests-PdfThumbnailProvider.csproj @@ -9,7 +9,9 @@ {F40C3397-1834-4530-B2D9-8F8B8456BCDF} PdfThumbnailProviderUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj index 8b4b8200fa..c7ef0a37ab 100644 --- a/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-StlThumbnailProvider/UnitTests-StlThumbnailProvider.csproj @@ -9,7 +9,9 @@ {F1F6B6B6-9F18-4A17-8B5C-97DF552C53DC} StlThumbnailProviderUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj index 8d99a196d1..0195936478 100644 --- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj +++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj @@ -9,7 +9,9 @@ {060D75DA-2D1C-48E6-A4A1-6F0718B64661} SvgPreviewHandlerUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj index 2ddfad6f2a..100bc8ecdb 100644 --- a/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj +++ b/src/modules/previewpane/UnitTests-SvgThumbnailProvider/UnitTests-SvgThumbnailProvider.csproj @@ -9,7 +9,9 @@ {1EF1EEF0-10F0-4F2E-8550-39B6D8044D3E} SvgThumbnailProviderUnitTests - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages diff --git a/src/modules/previewpane/common/PreviewHandlerCommon.csproj b/src/modules/previewpane/common/PreviewHandlerCommon.csproj index 6c76eb14cd..51b491db71 100644 --- a/src/modules/previewpane/common/PreviewHandlerCommon.csproj +++ b/src/modules/previewpane/common/PreviewHandlerCommon.csproj @@ -4,8 +4,8 @@ PowerToys.PreviewHandlerCommon PowerToys PreviewHandlerCommon PowerToys PreviewHandlerCommon - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\PreviewHandlerCommonDocumentation.xml - ..\..\..\..\$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\PreviewHandlerCommonDocumentation.xml + ..\..\..\..\$(Platform)\$(Configuration) false false true @@ -14,7 +14,6 @@ {AF2349B8-E5B6-4004-9502-687C1C7730B1} net7.0-windows - ..\..\..\..\$(Platform)\$(Configuration)\obj\$(AssemblyName)\ PowerToys.PreviewHandlerCommon diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj index a7d0c151bc..85d7ce208e 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj +++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj @@ -28,7 +28,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\FileExplorerPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.powerpreview diff --git a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj index 5f9b2fac10..530a07de8e 100644 --- a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj +++ b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj @@ -24,7 +24,6 @@ {697C6AF9-0A48-49A9-866C-67DA12384015} Win32Proj RegistryPreviewExt - 10.0.19041.0 @@ -50,7 +49,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\RegistryPreview\ + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\ PowerToys.RegistryPreviewExt diff --git a/src/modules/registrypreview/RegistryPreviewExt/dllmain.cpp b/src/modules/registrypreview/RegistryPreviewExt/dllmain.cpp index 9c89f324bb..6d6039cd98 100644 --- a/src/modules/registrypreview/RegistryPreviewExt/dllmain.cpp +++ b/src/modules/registrypreview/RegistryPreviewExt/dllmain.cpp @@ -74,7 +74,7 @@ private: SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\RegistryPreview\\PowerToys.RegistryPreview.exe"; + sei.lpFile = L"WinUI3Apps\\PowerToys.RegistryPreview.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (ShellExecuteExW(&sei)) diff --git a/src/modules/registrypreview/RegistryPreviewUI/app.ico b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/app.ico similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/app.ico rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/app.ico diff --git a/src/modules/registrypreview/RegistryPreviewUI/Assets/data32.png b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/data32.png similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/Assets/data32.png rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/data32.png diff --git a/src/modules/registrypreview/RegistryPreviewUI/Assets/deleted-folder32.png b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/deleted-folder32.png similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/Assets/deleted-folder32.png rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/deleted-folder32.png diff --git a/src/modules/registrypreview/RegistryPreviewUI/Assets/deleted-value32.png b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/deleted-value32.png similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/Assets/deleted-value32.png rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/deleted-value32.png diff --git a/src/modules/registrypreview/RegistryPreviewUI/Assets/error32.png b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/error32.png similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/Assets/error32.png rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/error32.png diff --git a/src/modules/registrypreview/RegistryPreviewUI/Assets/folder32.png b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/folder32.png similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/Assets/folder32.png rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/folder32.png diff --git a/src/modules/registrypreview/RegistryPreviewUI/Assets/string32.png b/src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/string32.png similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/Assets/string32.png rename to src/modules/registrypreview/RegistryPreviewUI/Assets/RegistryPreview/string32.png diff --git a/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj index 9e68b9e7b4..b78b7d1942 100644 --- a/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj +++ b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewUI.csproj @@ -2,13 +2,14 @@ WinExe - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 10.0.19041.0 + 10.0.19041.0 x86;x64;arm64 - $(SolutionDir)$(Platform)\$(Configuration)\modules\RegistryPreview + ..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps true False - app.ico + Assets\RegistryPreview\app.ico app.manifest true false @@ -16,7 +17,6 @@ true None true - 10.0.19041.0 true $(AssemblyName) PowerToys.RegistryPreview @@ -25,8 +25,17 @@ RegistryPreview true true + + PowerToys.RegistryPreview.pri + + + + + + + win10-x64 @@ -36,15 +45,23 @@ - + + + + PowerToys.GPOWrapper + $(OutDir) + false + + https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json + @@ -54,14 +71,15 @@ + - + Never - + Never diff --git a/src/modules/registrypreview/RegistryPreviewUI/App.xaml b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/App.xaml similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/App.xaml rename to src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/App.xaml diff --git a/src/modules/registrypreview/RegistryPreviewUI/App.xaml.cs b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/App.xaml.cs similarity index 100% rename from src/modules/registrypreview/RegistryPreviewUI/App.xaml.cs rename to src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/App.xaml.cs diff --git a/src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml similarity index 99% rename from src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml rename to src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml index cfafc62993..59c5a9afe3 100644 --- a/src/modules/registrypreview/RegistryPreviewUI/MainWindow.xaml +++ b/src/modules/registrypreview/RegistryPreviewUI/RegistryPreviewXAML/MainWindow.xaml @@ -33,7 +33,7 @@ {5ABA70DE-3A3F-41F6-A1F5-D1F74F54F9BB} Win32Proj overlaywindow - 10.0.19041.0 VideoConferenceModule + ..\..\..\..\$(Platform)\$(Configuration)\ + PowerToys.VideoConferenceModule @@ -35,15 +36,9 @@ false - $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - PowerToys.VideoConferenceModule true - $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ - PowerToys.VideoConferenceModule @@ -67,10 +62,6 @@ $(OutDir)$(TargetName)$(TargetExt) shlwapi.lib;gdiplus.lib;dwmapi.lib;uxtheme.lib;shcore.lib;Wtsapi32.lib;%(AdditionalDependencies) - - xcopy /y /I "$(ProjectDir)Icons\*" "$(OutDir)Icons" -xcopy /y /I "$(ProjectDir)black.bmp*" "$(OutDir)" - @@ -90,10 +81,6 @@ xcopy /y /I "$(ProjectDir)black.bmp*" "$(OutDir)" $(OutDir)$(TargetName)$(TargetExt) shlwapi.lib;gdiplus.lib;dwmapi.lib;uxtheme.lib;shcore.lib;Wtsapi32.lib;dxguid.lib;%(AdditionalDependencies) - - xcopy /y /I "$(ProjectDir)Icons\*" "$(OutDir)Icons" -xcopy /y /I "$(ProjectDir)black.bmp*" "$(OutDir)" - @@ -121,34 +108,58 @@ xcopy /y /I "$(ProjectDir)black.bmp*" "$(OutDir)" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + diff --git a/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters b/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters index 778cc31ca0..4712799e4f 100644 --- a/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters +++ b/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj.filters @@ -18,89 +18,55 @@ - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - Icons - - - - - {735361e2-82fa-4034-b9c9-cd6aa099eaa5} + + {efd98846-4568-41d4-a425-451c246802cd} + + + {e79f8c1a-b78b-4ba5-b923-f7db79eba776} + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + + Assets\VCM + + \ No newline at end of file diff --git a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp index d4b370fe78..be90356674 100644 --- a/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp +++ b/src/modules/videoconference/VideoConferenceModule/VideoConferenceModule.cpp @@ -534,8 +534,7 @@ void toggleProxyCamRegistration(const bool enable) return; } - auto vcmRoot = fs::path{ get_module_folderpath() } / "modules"; - vcmRoot /= "VideoConference"; + auto vcmRoot = fs::path{ get_module_folderpath() }; #if defined(_M_ARM64) std::array proxyFilters = { vcmRoot / "PowerToys.VideoConferenceProxyFilter_ARM64.dll", vcmRoot / "PowerToys.VideoConferenceProxyFilter_x86.dll" }; #else @@ -687,7 +686,7 @@ void VideoConferenceModule::sendOverlayImageUpdate() PathRemoveFileSpecW(powertoysDirectory); std::wstring blankImagePath(powertoysDirectory); - blankImagePath += L"\\modules\\VideoConference\\black.bmp"; + blankImagePath += L"\\Assets\\VCM\\black.bmp"; _imageOverlayChannel = SerializedSharedMemory::create_readonly(CameraOverlayImageChannel::endpoint(), settings.imageOverlayPath != L"" ? settings.imageOverlayPath : blankImagePath); diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj index febe73a738..43ff97ace1 100644 --- a/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj +++ b/src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj @@ -83,11 +83,11 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ + ..\..\..\..\$(Platform)\$(Configuration)\ PowerToys.VideoConferenceProxyFilter_$(Platform) - ..\..\..\..\x86\$(Configuration)\modules\VideoConference\ + ..\..\..\..\x86\$(Configuration)\ PowerToys.VideoConferenceProxyFilter_x86 diff --git a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj index c57123bdc7..0e0bd5446c 100644 --- a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj +++ b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj @@ -55,12 +55,10 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + ..\..\..\..\$(Platform)\$(Configuration)\ - ..\..\..\..\x86\$(Configuration)\modules\VideoConference\ - ..\..\..\..\x86\$(Configuration)\obj\$(ProjectName)\ + ..\..\..\..\x86\$(Configuration)\ true diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 5b8fa6d7b6..e598adbabc 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -89,28 +89,6 @@ void open_menu_from_another_instance(std::optional settings_window) PostMessageW(hwnd_main, WM_COMMAND, ID_SETTINGS_MENU_COMMAND, msg); } -void debug_verify_launcher_assets() -{ - try - { - namespace fs = std::filesystem; - const fs::path powertoysRoot = get_module_folderpath(); - constexpr std::array assetsToCheck = { "modules\\launcher\\Images\\app_error.dark.png", - "modules\\launcher\\Images\\app_error.light.png" }; - for (const auto asset : assetsToCheck) - { - const auto assetPath = powertoysRoot / asset; - if (!fs::is_regular_file(assetPath)) - { - Logger::error("{} couldn't be found.", assetPath.string()); - } - } - } - catch (...) - { - } -} - int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow, bool openOobe, bool openScoobe) { Logger::info("Runner is starting. Elevated={}", isProcessElevated); @@ -128,8 +106,6 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow int result = -1; try { - debug_verify_launcher_assets(); - std::thread{ [] { PeriodicUpdateWorker(); } }.detach(); @@ -145,31 +121,31 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow // Load Powertoys DLLs std::vector knownModules = { - L"modules/FancyZones/PowerToys.FancyZonesModuleInterface.dll", - L"modules/FileExplorerPreview/PowerToys.powerpreview.dll", - L"modules/ImageResizer/PowerToys.ImageResizerExt.dll", - L"modules/KeyboardManager/PowerToys.KeyboardManager.dll", - L"modules/Launcher/PowerToys.Launcher.dll", - L"modules/PowerRename/PowerToys.PowerRenameExt.dll", - L"modules/ShortcutGuide/ShortcutGuideModuleInterface/PowerToys.ShortcutGuideModuleInterface.dll", - L"modules/ColorPicker/PowerToys.ColorPicker.dll", - L"modules/Awake/PowerToys.AwakeModuleInterface.dll", - L"modules/MouseUtils/PowerToys.FindMyMouse.dll", - L"modules/MouseUtils/PowerToys.MouseHighlighter.dll", - L"modules/MouseUtils/PowerToys.MouseJump.dll", - L"modules/AlwaysOnTop/PowerToys.AlwaysOnTopModuleInterface.dll", - L"modules/MouseUtils/PowerToys.MousePointerCrosshairs.dll", - L"modules/PowerAccent/PowerToys.PowerAccentModuleInterface.dll", - L"modules/PowerOCR/PowerToys.PowerOCRModuleInterface.dll", - L"modules/PastePlain/PowerToys.PastePlainModuleInterface.dll", - L"modules/FileLocksmith/PowerToys.FileLocksmithExt.dll", - L"modules/RegistryPreview/PowerToys.RegistryPreviewExt.dll", - L"modules/MeasureTool/PowerToys.MeasureToolModuleInterface.dll", - L"modules/Hosts/PowerToys.HostsModuleInterface.dll", - L"modules/Peek/PowerToys.Peek.dll", - L"modules/MouseWithoutBorders/PowerToys.MouseWithoutBordersModuleInterface.dll", + L"PowerToys.FancyZonesModuleInterface.dll", + L"PowerToys.powerpreview.dll", + L"PowerToys.ImageResizerExt.dll", + L"PowerToys.KeyboardManager.dll", + L"PowerToys.Launcher.dll", + L"WinUI3Apps/PowerToys.PowerRenameExt.dll", + L"PowerToys.ShortcutGuideModuleInterface.dll", + L"PowerToys.ColorPicker.dll", + L"PowerToys.AwakeModuleInterface.dll", + L"PowerToys.FindMyMouse.dll", + L"PowerToys.MouseHighlighter.dll", + L"PowerToys.MouseJump.dll", + L"PowerToys.AlwaysOnTopModuleInterface.dll", + L"PowerToys.MousePointerCrosshairs.dll", + L"PowerToys.PowerAccentModuleInterface.dll", + L"PowerToys.PowerOCRModuleInterface.dll", + L"PowerToys.PastePlainModuleInterface.dll", + L"WinUI3Apps/PowerToys.FileLocksmithExt.dll", + L"WinUI3Apps/PowerToys.RegistryPreviewExt.dll", + L"WinUI3Apps/PowerToys.MeasureToolModuleInterface.dll", + L"WinUI3Apps/PowerToys.HostsModuleInterface.dll", + L"WinUI3Apps/PowerToys.Peek.dll", + L"PowerToys.MouseWithoutBordersModuleInterface.dll", }; - const auto VCM_PATH = L"modules/VideoConference/PowerToys.VideoConferenceModule.dll"; + const auto VCM_PATH = L"PowerToys.VideoConferenceModule.dll"; if (const auto mf = LoadLibraryA("mf.dll")) { FreeLibrary(mf); diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp index b56996aa79..0371eca889 100644 --- a/src/runner/settings_window.cpp +++ b/src/runner/settings_window.cpp @@ -341,7 +341,7 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op // Arg 1: executable path. std::wstring executable_path = get_module_folderpath(); - executable_path.append(L"\\Settings\\PowerToys.Settings.exe"); + executable_path.append(L"\\WinUI3Apps\\PowerToys.Settings.exe"); // Args 2,3: pipe server. Generate unique names for the pipes, if getting a UUID is possible. std::wstring powertoys_pipe_name(L"\\\\.\\pipe\\powertoys_runner_"); diff --git a/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs b/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs index 3ca22b9b39..7c4070b209 100644 --- a/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs +++ b/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs @@ -91,6 +91,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities public static string GetPowerToysInstallationFolder() { + // PowerToys.exe is in the parent folder relative to Settings. var settingsPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); return Directory.GetParent(settingsPath).FullName; } diff --git a/src/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs b/src/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs index f7b25470e2..c298670ee5 100644 --- a/src/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs +++ b/src/settings-ui/Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs @@ -15,7 +15,7 @@ namespace Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility { public static class BackCompatTestProperties { - public const string RootPathStubFiles = "..\\..\\..\\..\\src\\settings-ui\\Settings.UI.UnitTests\\BackwardsCompatibility\\TestFiles\\{0}\\Microsoft\\PowerToys\\{1}\\{2}"; + public const string RootPathStubFiles = "..\\..\\..\\..\\..\\src\\settings-ui\\Settings.UI.UnitTests\\BackwardsCompatibility\\TestFiles\\{0}\\Microsoft\\PowerToys\\{1}\\{2}"; // Using Ordinal since this is used internally for a path private static readonly Expression> SettingsFilterExpression = s => s == null || s.Contains("Microsoft\\PowerToys\\settings.json", StringComparison.Ordinal); diff --git a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj index 385bf0ab67..f82cc27cc6 100644 --- a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj +++ b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj @@ -1,14 +1,16 @@  - net7.0-windows10.0.19041.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 false win10-x64;win10-arm64 $(Version).0 - ..\..\..\x64\Debug\SettingsTests\ + ..\..\..\x64\Debug\tests\SettingsTests\ full true DEBUG;TRACE @@ -22,7 +24,7 @@ - ..\..\..\x64\Release\SettingsTest\ + ..\..\..\x64\Release\tests\SettingsTest\ diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsAlwaysOnTop.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsAlwaysOnTop.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsAwake.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAwake.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsAwake.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAwake.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsColorPicker.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsColorPicker.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsColorPicker.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsColorPicker.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFancyZones.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFancyZones.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFancyZones.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFancyZones.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFileExplorerPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFileExplorerPreview.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFileLocksmith.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFileLocksmith.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFindMyMouse.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFindMyMouse.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsFindMyMouse.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFindMyMouse.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsHosts.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsHosts.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsHosts.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsHosts.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsImageResizer.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsImageResizer.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsImageResizer.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsImageResizer.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsKeyboardManager.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsKeyboardManager.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseCrosshairs.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseCrosshairs.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseHighlighter.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseHighlighter.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseHighlighter.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseHighlighter.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseJump.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseJump.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseJump.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseJump.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseUtils.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseUtils.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsMouseWithoutBorders.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPastePlain.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPastePlain.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPastePlain.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPastePlain.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPeek.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPeek.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPeek.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPeek.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerAccent.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerAccent.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerOcr.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerOcr.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerRename.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerRename.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerRename.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerRename.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerToys.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToys.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerToys.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToys.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerToysRun.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsPowerToysRun.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsRegistryPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsRegistryPreview.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsScreenRuler.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsScreenRuler.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsSettings.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsSettings.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsSettings.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsSettings.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsShortcutGuide.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsShortcutGuide.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png diff --git a/src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsVideoConferenceMute.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/FluentIcons/FluentIconsVideoConferenceMute.png rename to src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png diff --git a/src/settings-ui/Settings.UI/Assets/LockScreenLogo.scale-200.png b/src/settings-ui/Settings.UI/Assets/Settings/LockScreenLogo.scale-200.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/LockScreenLogo.scale-200.png rename to src/settings-ui/Settings.UI/Assets/Settings/LockScreenLogo.scale-200.png diff --git a/src/settings-ui/Settings.UI/Assets/Logo.scale-200.png b/src/settings-ui/Settings.UI/Assets/Settings/Logo.scale-200.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Logo.scale-200.png rename to src/settings-ui/Settings.UI/Assets/Settings/Logo.scale-200.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/AlwaysOnTop.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/AlwaysOnTop.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/AlwaysOnTop.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/AlwaysOnTop.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/Awake.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Awake.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/Awake.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/Awake.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/ColorPicker.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/ColorPicker.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/ColorPicker.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/ColorPicker.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/FancyZones.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/FancyZones.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/FancyZones.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/FancyZones.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/FileLocksmith.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileLocksmith.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/FileLocksmith.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/FileLocksmith.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/HostsFileEditor.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/HostsFileEditor.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/HostsFileEditor.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/HostsFileEditor.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/ImageResizer.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/ImageResizer.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/ImageResizer.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/ImageResizer.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/KBM.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/KBM.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/KBM.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/KBM.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/MouseUtils.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseUtils.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/MouseUtils.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseUtils.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/MouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseWithoutBorders.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/MouseWithoutBorders.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseWithoutBorders.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/AlwaysOnTop.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/AlwaysOnTop.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/AlwaysOnTop.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/AlwaysOnTop.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/Awake.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Awake.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/Awake.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Awake.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/ColorPicker.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ColorPicker.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/ColorPicker.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ColorPicker.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/FancyZones.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FancyZones.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/FancyZones.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FancyZones.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/FileExplorer.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileExplorer.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/FileExplorer.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileExplorer.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/FileLocksmith.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileLocksmith.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/FileLocksmith.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileLocksmith.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/HostsFileEditor.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/HostsFileEditor.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/HostsFileEditor.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/HostsFileEditor.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/ImageResizer.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ImageResizer.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/ImageResizer.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ImageResizer.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/KBM.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/KBM.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/KBM.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/KBM.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/MouseUtils.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseUtils.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/MouseUtils.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseUtils.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/MouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseWithoutBorders.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/MouseWithoutBorders.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseWithoutBorders.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/OOBEPTHero.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHero.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/OOBEPTHero.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHero.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/OOBEPTHeroShort.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHeroShort.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/OOBEPTHeroShort.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHeroShort.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/OOBEShortcutGuide.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/OOBEShortcutGuide.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/PastePlain.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PastePlain.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/PastePlain.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PastePlain.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/Peek.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/Peek.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/PowerAccent.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerAccent.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/PowerAccent.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerAccent.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/PowerOCR.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerOCR.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/PowerOCR.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerOCR.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/PowerRename.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerRename.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/PowerRename.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerRename.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/RegistryPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/RegistryPreview.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/RegistryPreview.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/RegistryPreview.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/Run.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Run.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/Run.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Run.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/ScreenRuler.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ScreenRuler.gif similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/ScreenRuler.gif rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ScreenRuler.gif diff --git a/src/settings-ui/Settings.UI/Assets/Modules/OOBE/VideoConferenceMute.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/VideoConferenceMute.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/OOBE/VideoConferenceMute.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/VideoConferenceMute.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PT.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PT.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PT.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PT.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PastePlain.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PastePlain.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PastePlain.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PastePlain.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/Peek.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Peek.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/Peek.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/Peek.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PowerAccent.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerAccent.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PowerAccent.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerAccent.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PowerLauncher.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerLauncher.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PowerLauncher.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerLauncher.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PowerOCR.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerOCR.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PowerOCR.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerOCR.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PowerPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerPreview.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PowerPreview.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerPreview.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/PowerRename.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerRename.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/PowerRename.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerRename.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/RegistryPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/RegistryPreview.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/RegistryPreview.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/RegistryPreview.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/ScreenRuler.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/ScreenRuler.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/ScreenRuler.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/ScreenRuler.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/ShortcutGuide.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/ShortcutGuide.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/ShortcutGuide.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/ShortcutGuide.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/VideoConference.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/VideoConference.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/VideoConference.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/VideoConference.png diff --git a/src/settings-ui/Settings.UI/Assets/Modules/Wallpaper.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Wallpaper.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Modules/Wallpaper.png rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/Wallpaper.png diff --git a/src/settings-ui/Settings.UI/Assets/SplashScreen.png b/src/settings-ui/Settings.UI/Assets/Settings/SplashScreen.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/SplashScreen.png rename to src/settings-ui/Settings.UI/Assets/Settings/SplashScreen.png diff --git a/src/settings-ui/Settings.UI/Assets/SplashScreen.scale-200.png b/src/settings-ui/Settings.UI/Assets/Settings/SplashScreen.scale-200.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/SplashScreen.scale-200.png rename to src/settings-ui/Settings.UI/Assets/Settings/SplashScreen.scale-200.png diff --git a/src/settings-ui/Settings.UI/Assets/Square150x150Logo.scale-200.png b/src/settings-ui/Settings.UI/Assets/Settings/Square150x150Logo.scale-200.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Square150x150Logo.scale-200.png rename to src/settings-ui/Settings.UI/Assets/Settings/Square150x150Logo.scale-200.png diff --git a/src/settings-ui/Settings.UI/Assets/Square44x44Logo.scale-200.png b/src/settings-ui/Settings.UI/Assets/Settings/Square44x44Logo.scale-200.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Square44x44Logo.scale-200.png rename to src/settings-ui/Settings.UI/Assets/Settings/Square44x44Logo.scale-200.png diff --git a/src/settings-ui/Settings.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/settings-ui/Settings.UI/Assets/Settings/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/settings-ui/Settings.UI/Assets/Settings/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/src/settings-ui/Settings.UI/Assets/StoreLogo.png b/src/settings-ui/Settings.UI/Assets/Settings/StoreLogo.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/StoreLogo.png rename to src/settings-ui/Settings.UI/Assets/Settings/StoreLogo.png diff --git a/src/settings-ui/Settings.UI/Assets/StoreLogo.scale-100.png b/src/settings-ui/Settings.UI/Assets/Settings/StoreLogo.scale-100.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/StoreLogo.scale-100.png rename to src/settings-ui/Settings.UI/Assets/Settings/StoreLogo.scale-100.png diff --git a/src/settings-ui/Settings.UI/Assets/Wide310x150Logo.scale-200.png b/src/settings-ui/Settings.UI/Assets/Settings/Wide310x150Logo.scale-200.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/Wide310x150Logo.scale-200.png rename to src/settings-ui/Settings.UI/Assets/Settings/Wide310x150Logo.scale-200.png diff --git a/src/settings-ui/Settings.UI/icon.ico b/src/settings-ui/Settings.UI/Assets/Settings/icon.ico similarity index 100% rename from src/settings-ui/Settings.UI/icon.ico rename to src/settings-ui/Settings.UI/Assets/Settings/icon.ico diff --git a/src/settings-ui/Settings.UI/Assets/logo.png b/src/settings-ui/Settings.UI/Assets/Settings/logo.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/logo.png rename to src/settings-ui/Settings.UI/Assets/Settings/logo.png diff --git a/src/settings-ui/Settings.UI/Assets/logo150.png b/src/settings-ui/Settings.UI/Assets/Settings/logo150.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/logo150.png rename to src/settings-ui/Settings.UI/Assets/Settings/logo150.png diff --git a/src/settings-ui/Settings.UI/Assets/logo44.png b/src/settings-ui/Settings.UI/Assets/Settings/logo44.png similarity index 100% rename from src/settings-ui/Settings.UI/Assets/logo44.png rename to src/settings-ui/Settings.UI/Assets/Settings/logo44.png diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs index cb7098eed3..b3ead132cd 100644 --- a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs @@ -5,7 +5,6 @@ using System; using System.Globalization; using Microsoft.UI.Xaml.Data; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.Converters { @@ -22,9 +21,9 @@ namespace Microsoft.PowerToys.Settings.UI.Converters string targetValue = string.Empty; switch (value) { - case 0: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Fit_Fill_ThirdPersonSingular"); break; - case 1: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Fit_Fit_ThirdPersonSingular"); break; - case 2: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Fit_Stretch_ThirdPersonSingular"); break; + case 0: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Fit_Fill_ThirdPersonSingular"); break; + case 1: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Fit_Fit_ThirdPersonSingular"); break; + case 2: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Fit_Stretch_ThirdPersonSingular"); break; } if (toLower) diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs index f001608aae..bdba70c0b1 100644 --- a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs +++ b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs @@ -5,7 +5,6 @@ using System; using System.Globalization; using Microsoft.UI.Xaml.Data; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.Converters { @@ -22,10 +21,10 @@ namespace Microsoft.PowerToys.Settings.UI.Converters string targetValue = string.Empty; switch (value) { - case 0: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Unit_Centimeter"); break; - case 1: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Unit_Inch"); break; - case 2: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Unit_Percent"); break; - case 3: targetValue = ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_Unit_Pixel"); break; + case 0: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Unit_Centimeter"); break; + case 1: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Unit_Inch"); break; + case 2: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Unit_Percent"); break; + case 3: targetValue = Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_Unit_Pixel"); break; } if (toLower) diff --git a/src/settings-ui/Settings.UI/Helpers/ResourceExtensions.cs b/src/settings-ui/Settings.UI/Helpers/ResourceExtensions.cs index 3f18701ef7..75ef2086a1 100644 --- a/src/settings-ui/Settings.UI/Helpers/ResourceExtensions.cs +++ b/src/settings-ui/Settings.UI/Helpers/ResourceExtensions.cs @@ -2,13 +2,13 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Windows.ApplicationModel.Resources; +using Microsoft.Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.Helpers { internal static class ResourceExtensions { - private static readonly ResourceLoader ResLoader = new ResourceLoader(); + private static readonly ResourceLoader ResLoader = ResourceLoaderInstance.ResourceLoader; public static string GetLocalized(this string resourceKey) { diff --git a/src/settings-ui/Settings.UI/Helpers/ResourceLoaderInstance.cs b/src/settings-ui/Settings.UI/Helpers/ResourceLoaderInstance.cs new file mode 100644 index 0000000000..45e93562de --- /dev/null +++ b/src/settings-ui/Settings.UI/Helpers/ResourceLoaderInstance.cs @@ -0,0 +1,17 @@ +// 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 Microsoft.Windows.ApplicationModel.Resources; + +namespace Microsoft.PowerToys.Settings.UI.Helpers +{ + internal static class ResourceLoaderInstance + { + internal static ResourceLoader ResourceLoader { get; private set; } + + static ResourceLoaderInstance() + { + ResourceLoader = new Microsoft.Windows.ApplicationModel.Resources.ResourceLoader("PowerToys.Settings.pri"); + } + } +} diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj index decb2e5e71..acf883b1b5 100644 --- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj +++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj @@ -2,8 +2,9 @@ WinExe - net7.0-windows10.0.19041.0 - 10.0.17763.0 + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 Microsoft.PowerToys.Settings.UI app.manifest win10-x64;win10-arm64 @@ -12,13 +13,22 @@ None false false - icon.ico + Assets\Settings\icon.ico true - ..\..\..\$(Platform)\$(Configuration)\Settings + ..\..\..\$(Platform)\$(Configuration)\WinUI3Apps true + + PowerToys.Settings.pri + + + + + + + win10-x64 @@ -55,29 +65,15 @@ https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -91,6 +87,8 @@ + + + @@ -118,44 +118,9 @@ - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - + Always - - MSBuild:Compile - - - MSBuild:Compile - - - $(DefaultXamlRuntime) - - - $(DefaultXamlRuntime) - - - - $(DefaultXamlRuntime) - - diff --git a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml index ee0a3433a5..1a0c71a859 100644 --- a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml +++ b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml @@ -5,8 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem - net7.0-windows10.0.19041.0 - $(PowerToysRoot)\$(Platform)\$(Configuration)\Settings + net7.0-windows10.0.20348.0 + 10.0.19041.0 + 10.0.19041.0 + $(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps win10-$(Platform) true False diff --git a/src/settings-ui/Settings.UI/App.xaml b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml similarity index 85% rename from src/settings-ui/Settings.UI/App.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/App.xaml index e32dfc58d1..14bcb9eb6f 100644 --- a/src/settings-ui/Settings.UI/App.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml @@ -10,11 +10,12 @@ - - - - - + + + + + + diff --git a/src/settings-ui/Settings.UI/App.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/App.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs diff --git a/src/settings-ui/Settings.UI/Controls/CheckBoxWithDescriptionControl.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/CheckBoxWithDescriptionControl.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs diff --git a/src/settings-ui/Settings.UI/Controls/ColorFormatEditor.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ColorFormatEditor.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml diff --git a/src/settings-ui/Settings.UI/Controls/ColorFormatEditor.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml.cs similarity index 97% rename from src/settings-ui/Settings.UI/Controls/ColorFormatEditor.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml.cs index 76c2db391e..9ed817d697 100644 --- a/src/settings-ui/Settings.UI/Controls/ColorFormatEditor.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml.cs @@ -12,7 +12,7 @@ using Microsoft.PowerToys.Settings.UI.Helpers; using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.ViewModels; using Microsoft.UI.Xaml.Controls; -using Windows.ApplicationModel.Resources; +using Microsoft.Windows.ApplicationModel.Resources; using Windows.System; namespace Microsoft.PowerToys.Settings.UI.Controls @@ -27,7 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls public void LoadParameters() { - ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + ResourceLoader resourceLoader = ResourceLoaderInstance.ResourceLoader; ParametersItemsControl.ItemsSource = new List { new ColorFormatParameter() { Parameter = "%Re", Description = resourceLoader.GetString("Help_red") }, diff --git a/src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml diff --git a/src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml.cs diff --git a/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml.cs similarity index 99% rename from src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml.cs index 0bf4e212c4..405d5d6e7d 100644 --- a/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml.cs @@ -53,7 +53,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls set { SetValue(WallpaperPathProperty, value); } } - public static readonly DependencyProperty WallpaperPathProperty = DependencyProperty.Register("WallpaperPath", typeof(string), typeof(FancyZonesPreviewControl), new PropertyMetadata("ms-appx:///Assets/Modules/Wallpaper.png")); + public static readonly DependencyProperty WallpaperPathProperty = DependencyProperty.Register("WallpaperPath", typeof(string), typeof(FancyZonesPreviewControl), new PropertyMetadata("ms-appx:///Assets/Settings/Modules/Wallpaper.png")); public Color CustomBorderColor { diff --git a/src/settings-ui/Settings.UI/Controls/FlyoutMenuButton/FlyoutMenuButton.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/FlyoutMenuButton/FlyoutMenuButton.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.cs diff --git a/src/settings-ui/Settings.UI/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml diff --git a/src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs diff --git a/src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml diff --git a/src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs diff --git a/src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml diff --git a/src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml.cs diff --git a/src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml.cs diff --git a/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.cs diff --git a/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml diff --git a/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs diff --git a/src/settings-ui/Settings.UI/Controls/SettingsPageControl/PageLink.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/PageLink.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/SettingsPageControl/PageLink.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/PageLink.cs diff --git a/src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs similarity index 99% rename from src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs index 1f67da290b..0b77571eda 100644 --- a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs @@ -9,7 +9,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using Windows.ApplicationModel.Resources; using Windows.System; namespace Microsoft.PowerToys.Settings.UI.Controls @@ -87,7 +86,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls this.Unloaded += ShortcutControl_Unloaded; hook = new HotkeySettingsControlHook(Hotkey_KeyDown, Hotkey_KeyUp, Hotkey_IsActive, FilterAccessibleKeyboardEvents); - ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; if (App.GetSettingsWindow() != null) { diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml.cs diff --git a/src/settings-ui/Settings.UI/Flyout/AppsListPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Flyout/AppsListPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml diff --git a/src/settings-ui/Settings.UI/Flyout/AppsListPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Flyout/AppsListPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Flyout/LaunchPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Flyout/LaunchPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml diff --git a/src/settings-ui/Settings.UI/Flyout/LaunchPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Flyout/LaunchPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Flyout/ShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/ShellPage.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Flyout/ShellPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Flyout/ShellPage.xaml diff --git a/src/settings-ui/Settings.UI/Flyout/ShellPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/ShellPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Flyout/ShellPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Flyout/ShellPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/FlyoutWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml similarity index 100% rename from src/settings-ui/Settings.UI/FlyoutWindow.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml diff --git a/src/settings-ui/Settings.UI/FlyoutWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/FlyoutWindow.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml similarity index 100% rename from src/settings-ui/Settings.UI/MainWindow.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs similarity index 98% rename from src/settings-ui/Settings.UI/MainWindow.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs index e26ec2683d..8d1473e687 100644 --- a/src/settings-ui/Settings.UI/MainWindow.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs @@ -12,7 +12,6 @@ using Microsoft.PowerToys.Telemetry; using Microsoft.UI; using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; -using Windows.ApplicationModel.Resources; using Windows.Data.Json; using WinUIEx; @@ -35,7 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this); WindowId windowId = Win32Interop.GetWindowIdFromWindow(hWnd); AppWindow appWindow = AppWindow.GetFromWindowId(windowId); - appWindow.SetIcon("icon.ico"); + appWindow.SetIcon("Assets\\Settings\\icon.ico"); // Passed by parameter, as it needs to be evaluated ASAP, otherwise there is a white flash if (isDark) @@ -51,7 +50,7 @@ namespace Microsoft.PowerToys.Settings.UI NativeMethods.SetWindowPlacement(hWnd, ref placement); - ResourceLoader loader = ResourceLoader.GetForViewIndependentUse(); + var loader = Helpers.ResourceLoaderInstance.ResourceLoader; Title = loader.GetString("SettingsWindow_Title"); // send IPC Message diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml index e9dd27edd7..dce08d3636 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeAwake.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeAwake.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml index a30004b872..4a069f2f3f 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml index 33b57d96c0..21b96e3cbc 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml @@ -10,7 +10,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml similarity index 95% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml index 766cc20a2d..70495de7c0 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml index 2f3f7eb1fc..35a2ebd79f 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml @@ -10,7 +10,7 @@ mc:Ignorable="d"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml similarity index 95% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml index df02035fac..000c684abe 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeImageResizer.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeImageResizer.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml index 6a48076685..b11c55ba5e 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml index e46476d488..3d564de73e 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml similarity index 97% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml index 13c4f7637c..2549f040c7 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml @@ -10,7 +10,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseWithoutBorders.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeMouseWithoutBorders.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml index be04eae1f2..edb31f08dd 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseWithoutBorders.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml @@ -10,7 +10,7 @@ mc:Ignorable="d"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseWithoutBorders.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeMouseWithoutBorders.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml similarity index 95% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml index b7033e4a62..a75172a0a2 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml @@ -10,7 +10,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverviewAlternate.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml similarity index 94% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeOverviewAlternate.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml index abe0a8dc0d..7c28045f16 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverviewAlternate.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml @@ -10,7 +10,7 @@ @@ -40,7 +40,7 @@ + Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsFancyZones.png" /> + Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png" /> + Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsColorPicker.png" /> + Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png" /> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePastePlain.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePastePlain.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePeek.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePeek.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml index 79337d5bcf..da4859a33b 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobePeek.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml @@ -15,7 +15,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePeek.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePeek.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml similarity index 95% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml index 67b3542be4..d51044ed11 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml index f9bf723f9b..d31ee46d57 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml index 31c72a23ab..8fe665cc06 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml @@ -10,7 +10,7 @@ mc:Ignorable="d"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeRegistryPreview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeRegistryPreview.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml index 0709030bea..f1f2afe79e 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeRegistryPreview.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml @@ -10,7 +10,7 @@ mc:Ignorable="d"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeRegistryPreview.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeRegistryPreview.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml similarity index 97% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml index 6bea8f9e81..52f884904c 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml similarity index 73% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml index 009d307459..58002dedb8 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml @@ -53,7 +53,7 @@ Width="16" Height="16" HorizontalAlignment="Left" - Source="/icon.ico" /> + Source="/Assets/Settings/icon.ico" /> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml index 00e03aa3f0..ebda534c48 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml @@ -10,7 +10,7 @@ mc:Ignorable="d"> + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml.cs similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml.cs index bfc1b8f554..3c87846257 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml.cs @@ -31,7 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views private void Start_ShortcutGuide_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) { - var executablePath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, @"..\modules\ShortcutGuide\ShortcutGuide\PowerToys.ShortcutGuide.exe"); + var executablePath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, @"PowerToys.ShortcutGuide.exe"); var id = System.Environment.ProcessId.ToString(CultureInfo.InvariantCulture); var p = Process.Start(executablePath, id); if (p != null) diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml similarity index 96% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml index d03ed301ca..adcf5160dd 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml @@ -11,7 +11,7 @@ + HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png"> diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml.cs diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs diff --git a/src/settings-ui/Settings.UI/OobeWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml similarity index 100% rename from src/settings-ui/Settings.UI/OobeWindow.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml diff --git a/src/settings-ui/Settings.UI/OobeWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs similarity index 96% rename from src/settings-ui/Settings.UI/OobeWindow.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs index 4ea99c3f1e..7b198bd5d8 100644 --- a/src/settings-ui/Settings.UI/OobeWindow.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml.cs @@ -11,7 +11,6 @@ using Microsoft.PowerToys.Settings.UI.OOBE.Views; using Microsoft.UI; using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; -using Windows.ApplicationModel.Resources; using Windows.Graphics; using WinUIEx; @@ -40,7 +39,7 @@ namespace Microsoft.PowerToys.Settings.UI _hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this); _windowId = Win32Interop.GetWindowIdFromWindow(_hWnd); _appWindow = AppWindow.GetFromWindowId(_windowId); - _appWindow.SetIcon("icon.ico"); + _appWindow.SetIcon("Assets\\Settings\\icon.ico"); // Passed by parameter, as it needs to be evaluated ASAP, otherwise there is a white flash if (isDark) @@ -69,7 +68,7 @@ namespace Microsoft.PowerToys.Settings.UI this.SizeChanged += OobeWindow_SizeChanged; - ResourceLoader loader = ResourceLoader.GetForViewIndependentUse(); + var loader = Helpers.ResourceLoaderInstance.ResourceLoader; Title = loader.GetString("OobeWindow_Title"); if (shellPage != null) diff --git a/src/settings-ui/Settings.UI/Styles/Button.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Styles/Button.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml diff --git a/src/settings-ui/Settings.UI/Styles/TextBlock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Styles/TextBlock.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml diff --git a/src/settings-ui/Settings.UI/Themes/Colors.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml similarity index 100% rename from src/settings-ui/Settings.UI/Themes/Colors.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml new file mode 100644 index 0000000000..b1c5f79256 --- /dev/null +++ b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml similarity index 97% rename from src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml index ee26f9fb94..ec144b9a8f 100644 --- a/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml @@ -13,12 +13,12 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/AlwaysOnTop.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/Awake.png"> - + diff --git a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs similarity index 98% rename from src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs index f8b55efdcf..2c7a4ef86d 100644 --- a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs @@ -10,7 +10,7 @@ using Microsoft.PowerToys.Settings.UI.Helpers; using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.ViewModels; using Microsoft.UI.Xaml.Controls; -using Windows.ApplicationModel.Resources; +using Microsoft.Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.Views { @@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views public ICommand UpdateCommand => new RelayCommand(Update); - private ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + private ResourceLoader resourceLoader = ResourceLoaderInstance.ResourceLoader; public ColorPickerPage() { diff --git a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml similarity index 99% rename from src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml index 9238774263..181c1baffa 100644 --- a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml @@ -12,12 +12,12 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/FancyZones.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/FileLocksmith.png"> diff --git a/src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml similarity index 99% rename from src/settings-ui/Settings.UI/Views/GeneralPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml index de3561ed0b..e3579dddcb 100644 --- a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml @@ -16,7 +16,7 @@ - + diff --git a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs similarity index 97% rename from src/settings-ui/Settings.UI/Views/GeneralPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs index 5d9051221c..8a99d5e2ee 100644 --- a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs @@ -12,7 +12,6 @@ using Microsoft.PowerToys.Settings.UI.OOBE.Views; using Microsoft.PowerToys.Settings.UI.ViewModels; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Windows.ApplicationModel.Resources; using Windows.Storage.Pickers; namespace Microsoft.PowerToys.Settings.UI.Views @@ -38,7 +37,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views InitializeComponent(); // Load string resources - ResourceLoader loader = ResourceLoader.GetForViewIndependentUse(); + var loader = Helpers.ResourceLoaderInstance.ResourceLoader; var settingsUtils = new SettingsUtils(); Action stateUpdatingAction = () => diff --git a/src/settings-ui/Settings.UI/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml similarity index 96% rename from src/settings-ui/Settings.UI/Views/HostsPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml index b73227699f..1b89ea36d7 100644 --- a/src/settings-ui/Settings.UI/Views/HostsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml @@ -9,12 +9,12 @@ xmlns:ui="using:CommunityToolkit.WinUI.UI" mc:Ignorable="d"> - + diff --git a/src/settings-ui/Settings.UI/Views/HostsPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Views/HostsPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml similarity index 99% rename from src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml index 53522cf987..bc29ac6ac2 100644 --- a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml @@ -21,12 +21,12 @@ FalseValue="1" TrueValue="0" /> - + diff --git a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs similarity index 91% rename from src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs index 2f6de716ef..cd5aedb792 100644 --- a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs @@ -10,7 +10,6 @@ using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.ViewModels; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.Views { @@ -22,7 +21,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views { InitializeComponent(); var settingsUtils = new SettingsUtils(); - var resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; Func loader = (string name) => { return resourceLoader.GetString(name); @@ -39,7 +38,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views if (deleteRowButton != null) { ImageSize x = (ImageSize)deleteRowButton.DataContext; - ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; ContentDialog dialog = new ContentDialog(); dialog.XamlRoot = RootPage.XamlRoot; @@ -69,7 +68,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views { try { - ViewModel.AddRow(ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_DefaultSize_NewSizePrefix")); + ViewModel.AddRow(Helpers.ResourceLoaderInstance.ResourceLoader.GetString("ImageResizer_DefaultSize_NewSizePrefix")); } catch (Exception ex) { diff --git a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml similarity index 98% rename from src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml index 1b6a42bc5c..81b8c7f2e2 100644 --- a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml @@ -58,12 +58,12 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/KBM.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/ScreenRuler.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseUtils.png"> - + + ModuleImageSource="ms-appx:///Assets/Settings/Modules/PastePlain.png"> - + diff --git a/src/settings-ui/Settings.UI/Views/PeekPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Views/PeekPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml similarity index 98% rename from src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml index 971bb300d9..a57a114974 100644 --- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -13,12 +13,12 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerAccent.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerLauncher.png"> >(); searchResultPreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchResultPreference_AlphabeticalOrder"), "alphabetical_order")); diff --git a/src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml similarity index 96% rename from src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml index f116b58891..5b2a789a2b 100644 --- a/src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml @@ -12,13 +12,13 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerOCR.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerPreview.png"> diff --git a/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml similarity index 96% rename from src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml index 6d3d9639ee..d8593b217e 100644 --- a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml @@ -12,14 +12,14 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerRename.png"> - + diff --git a/src/settings-ui/Settings.UI/Views/RegistryPreviewPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs similarity index 100% rename from src/settings-ui/Settings.UI/Views/RegistryPreviewPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs diff --git a/src/settings-ui/Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml similarity index 77% rename from src/settings-ui/Settings.UI/Views/ShellPage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml index ade6679c92..d04fb945a6 100644 --- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml @@ -46,7 +46,7 @@ Width="16" Height="16" HorizontalAlignment="Left" - Source="/icon.ico" /> + Source="/Assets/Settings/icon.ico" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsSettings.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAwake.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsColorPicker.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFancyZones.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsHosts.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsImageResizer.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPastePlain.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPeek.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerRename.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png}" /> diff --git a/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs similarity index 98% rename from src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs rename to src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs index 226fa002ca..ffcc01fa96 100644 --- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs @@ -10,7 +10,6 @@ using Microsoft.PowerToys.Settings.UI.ViewModels; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Automation.Peers; using Microsoft.UI.Xaml.Controls; -using Windows.ApplicationModel.Resources; using Windows.Data.Json; using Windows.System; @@ -273,7 +272,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views if (AutomationPeer.ListenerExists(AutomationEvents.MenuOpened)) { - var loader = ResourceLoader.GetForViewIndependentUse(); + var loader = Helpers.ResourceLoaderInstance.ResourceLoader; peer.RaiseNotificationEvent( AutomationNotificationKind.ActionCompleted, AutomationNotificationProcessing.ImportantMostRecent, @@ -298,7 +297,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views if (AutomationPeer.ListenerExists(AutomationEvents.MenuClosed)) { - var loader = ResourceLoader.GetForViewIndependentUse(); + var loader = Helpers.ResourceLoaderInstance.ResourceLoader; peer.RaiseNotificationEvent( AutomationNotificationKind.ActionCompleted, AutomationNotificationProcessing.ImportantMostRecent, diff --git a/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml similarity index 97% rename from src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml rename to src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml index 7b74c6badf..671042815d 100644 --- a/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml @@ -12,12 +12,12 @@ + ModuleImageSource="ms-appx:///Assets/Settings/Modules/ShortcutGuide.png"> + ModuleImageSource="ms-appx:///Assets/Settings/Modules/VideoConference.png"> @@ -44,7 +44,7 @@ - - - - - - - diff --git a/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs index 328f52e735..c3d7be6e70 100644 --- a/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs @@ -15,7 +15,6 @@ using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library.Enumerations; using Microsoft.PowerToys.Settings.UI.Library.Helpers; using Microsoft.PowerToys.Settings.UI.Library.Interfaces; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.ViewModels { @@ -392,7 +391,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels internal ColorFormatModel GetNewColorFormatModel() { - var resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; string defaultName = resourceLoader.GetString("CustomColorFormatDefaultName"); ColorFormatModel newColorFormatModel = new ColorFormatModel(); newColorFormatModel.Name = defaultName; diff --git a/src/settings-ui/Settings.UI/ViewModels/Flyout/AllAppsViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/Flyout/AllAppsViewModel.cs index 6fb1f95f6e..c6362d96fa 100644 --- a/src/settings-ui/Settings.UI/ViewModels/Flyout/AllAppsViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/Flyout/AllAppsViewModel.cs @@ -10,7 +10,6 @@ using Microsoft.PowerToys.Settings.UI.Flyout; using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library.Helpers; using Microsoft.PowerToys.Settings.UI.Library.Interfaces; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.ViewModels { @@ -31,116 +30,116 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels FlyoutMenuItems = new ObservableCollection(); - ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; GpoRuleConfigured gpo; if ((gpo = GPOWrapper.GetConfiguredAlwaysOnTopEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("AlwaysOnTop/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.AlwaysOnTop, Tag = "AlwaysOnTop", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("AlwaysOnTop/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.AlwaysOnTop, Tag = "AlwaysOnTop", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredAwakeEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("Awake/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.Awake, Tag = "Awake", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsAwake.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("Awake/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.Awake, Tag = "Awake", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsAwake.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredColorPickerEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("ColorPicker/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.ColorPicker, Tag = "ColorPicker", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("ColorPicker/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.ColorPicker, Tag = "ColorPicker", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsColorPicker.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredFancyZonesEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("FancyZones/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.FancyZones, Tag = "FancyZones", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("FancyZones/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.FancyZones, Tag = "FancyZones", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsFancyZones.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredFileLocksmithEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("FileLocksmith/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.FileLocksmith, Tag = "FileLocksmith", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsFileLocksmith.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("FileLocksmith/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.FileLocksmith, Tag = "FileLocksmith", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredFindMyMouseEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_FindMyMouse/Header"), IsEnabled = generalSettingsConfig.Enabled.FindMyMouse, Tag = "FindMyMouse", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsFindMyMouse.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_FindMyMouse/Header"), IsEnabled = generalSettingsConfig.Enabled.FindMyMouse, Tag = "FindMyMouse", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsFindMyMouse.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredHostsFileEditorEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("Hosts/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.Hosts, Tag = "Hosts", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsHosts.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("Hosts/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.Hosts, Tag = "Hosts", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsHosts.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredImageResizerEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("ImageResizer/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.ImageResizer, Tag = "ImageResizer", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("ImageResizer/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.ImageResizer, Tag = "ImageResizer", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsImageResizer.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredKeyboardManagerEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("KeyboardManager/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.KeyboardManager, Tag = "KeyboardManager", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("KeyboardManager/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.KeyboardManager, Tag = "KeyboardManager", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredMouseHighlighterEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_MouseHighlighter/Header"), IsEnabled = generalSettingsConfig.Enabled.MouseHighlighter, Tag = "MouseHighlighter", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsMouseHighlighter.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_MouseHighlighter/Header"), IsEnabled = generalSettingsConfig.Enabled.MouseHighlighter, Tag = "MouseHighlighter", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsMouseHighlighter.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredMouseJumpEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_MouseJump/Header"), IsEnabled = generalSettingsConfig.Enabled.MouseJump, Tag = "MouseJump", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsMouseJump.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_MouseJump/Header"), IsEnabled = generalSettingsConfig.Enabled.MouseJump, Tag = "MouseJump", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsMouseJump.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredMousePointerCrosshairsEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_MousePointerCrosshairs/Header"), IsEnabled = generalSettingsConfig.Enabled.MousePointerCrosshairs, Tag = "MousePointerCrosshairs", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsMouseCrosshairs.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseUtils_MousePointerCrosshairs/Header"), IsEnabled = generalSettingsConfig.Enabled.MousePointerCrosshairs, Tag = "MousePointerCrosshairs", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredMouseWithoutBordersEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseWithoutBorders/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.MouseWithoutBorders, Tag = "MouseWithoutBorders", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsMouseWithoutBorders.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MouseWithoutBorders/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.MouseWithoutBorders, Tag = "MouseWithoutBorders", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredPastePlainEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("PastePlain/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PastePlain, Tag = "PastePlain", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPastePlain.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("PastePlain/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PastePlain, Tag = "PastePlain", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPastePlain.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredPeekEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("Peek/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.Peek, Tag = "Peek", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPeek.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("Peek/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.Peek, Tag = "Peek", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPeek.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredPowerRenameEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("PowerRename/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerRename, Tag = "PowerRename", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("PowerRename/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerRename, Tag = "PowerRename", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerRename.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredPowerLauncherEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("PowerLauncher/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerLauncher, Tag = "PowerLauncher", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("PowerLauncher/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerLauncher, Tag = "PowerLauncher", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredQuickAccentEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("QuickAccent/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerAccent, Tag = "PowerAccent", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("QuickAccent/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerAccent, Tag = "PowerAccent", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerAccent.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredRegistryPreviewEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("RegistryPreview/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.RegistryPreview, Tag = "RegistryPreview", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsRegistryPreview.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("RegistryPreview/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.RegistryPreview, Tag = "RegistryPreview", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredScreenRulerEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MeasureTool/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.MeasureTool, Tag = "MeasureTool", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("MeasureTool/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.MeasureTool, Tag = "MeasureTool", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsScreenRuler.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredShortcutGuideEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("ShortcutGuide/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.ShortcutGuide, Tag = "ShortcutGuide", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("ShortcutGuide/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.ShortcutGuide, Tag = "ShortcutGuide", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png", EnabledChangedCallback = EnabledChangedOnUI }); } if ((gpo = GPOWrapper.GetConfiguredTextExtractorEnabledValue()) != GpoRuleConfigured.Disabled && gpo != GpoRuleConfigured.Enabled) { - FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("TextExtractor/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerOCR, Tag = "PowerOCR", Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png", EnabledChangedCallback = EnabledChangedOnUI }); + FlyoutMenuItems.Add(new FlyoutMenuItem() { Label = resourceLoader.GetString("TextExtractor/ModuleTitle"), IsEnabled = generalSettingsConfig.Enabled.PowerOCR, Tag = "PowerOCR", Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerOCR.png", EnabledChangedCallback = EnabledChangedOnUI }); } // set the callback functions value to hangle outgoing IPC message. diff --git a/src/settings-ui/Settings.UI/ViewModels/Flyout/LauncherViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/Flyout/LauncherViewModel.cs index 97062a2dba..5f50179cf3 100644 --- a/src/settings-ui/Settings.UI/ViewModels/Flyout/LauncherViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/Flyout/LauncherViewModel.cs @@ -9,7 +9,6 @@ using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library.Helpers; using Microsoft.PowerToys.Settings.UI.Library.Interfaces; using Microsoft.PowerToys.Settings.UI.Views; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.ViewModels { @@ -33,7 +32,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels // set the callback functions value to hangle outgoing IPC message. SendIPCMessage = ipcMSGCallBackFunc; - ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; FlyoutMenuItems = new ObservableCollection(); if (GPOWrapper.GetConfiguredColorPickerEnabledValue() != GpoRuleConfigured.Disabled) { @@ -43,7 +42,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Tag = "ColorPicker", Visible = generalSettingsConfig.Enabled.ColorPicker, ToolTip = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(), - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsColorPicker.png", }); } @@ -55,7 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Tag = "FancyZones", Visible = generalSettingsConfig.Enabled.FancyZones, ToolTip = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(), - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsFancyZones.png", }); } @@ -66,7 +65,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Label = resourceLoader.GetString("Hosts/ModuleTitle"), Tag = "Hosts", Visible = generalSettingsConfig.Enabled.Hosts, - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsHosts.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsHosts.png", }); } @@ -78,7 +77,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Tag = "PowerLauncher", Visible = generalSettingsConfig.Enabled.PowerLauncher, ToolTip = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenPowerLauncher.ToString(), - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png", }); } @@ -90,7 +89,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Tag = "PowerOCR", Visible = generalSettingsConfig.Enabled.PowerOCR, ToolTip = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(), - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerOcr.png", }); } @@ -101,7 +100,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Label = resourceLoader.GetString("RegistryPreview/ModuleTitle"), Tag = "RegistryPreview", Visible = generalSettingsConfig.Enabled.RegistryPreview, - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsRegistryPreview.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png", }); } @@ -113,7 +112,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Tag = "MeasureTool", Visible = generalSettingsConfig.Enabled.MeasureTool, ToolTip = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.ActivationShortcut.ToString(), - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsScreenRuler.png", }); } @@ -125,7 +124,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels Tag = "ShortcutGuide", Visible = generalSettingsConfig.Enabled.ShortcutGuide, ToolTip = SettingsRepository.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenShortcutGuide.ToString(), - Icon = "ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png", + Icon = "ms-appx:///Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png", }); } diff --git a/src/settings-ui/Settings.UI/ViewModels/KeyboardManagerViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/KeyboardManagerViewModel.cs index 771ac564d7..c4e395e992 100644 --- a/src/settings-ui/Settings.UI/ViewModels/KeyboardManagerViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/KeyboardManagerViewModel.cs @@ -18,7 +18,6 @@ using Microsoft.PowerToys.Settings.UI.Library.Helpers; using Microsoft.PowerToys.Settings.UI.Library.Interfaces; using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands; using Microsoft.PowerToys.Settings.Utilities; -using Windows.ApplicationModel.Resources; namespace Microsoft.PowerToys.Settings.UI.ViewModels { @@ -31,7 +30,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels private const string PowerToyName = KeyboardManagerSettings.ModuleName; private const string JsonFileType = ".json"; - private const string KeyboardManagerEditorPath = "modules\\KeyboardManager\\KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe"; + private const string KeyboardManagerEditorPath = "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe"; private Process editor; private enum KeyboardManagerEditorType @@ -176,7 +175,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels string allAppsDescription = "All Apps"; try { - ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse(); + var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader; allAppsDescription = resourceLoader.GetString("KeyboardManager_All_Apps_Description"); } catch (Exception ex) diff --git a/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs index 7618fe1eed..b222c4ddf9 100644 --- a/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/ShellViewModel.cs @@ -49,7 +49,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels NativeMethods.FreeLibrary(mfHandle); } - return this != null && File.Exists("modules/VideoConference/PowerToys.VideoConferenceModule.dll") && mfAvailable; + return this != null && File.Exists("PowerToys.VideoConferenceModule.dll") && mfAvailable; } } diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj index f2f4abe6ba..287f22c40c 100644 --- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj +++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj @@ -15,7 +15,6 @@ Application - $(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\ $(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\ @@ -86,14 +85,14 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/tools/BugReportTool/BugReportTool/packages.config b/tools/BugReportTool/BugReportTool/packages.config index 06e6b82e58..c92dd4bf0c 100644 --- a/tools/BugReportTool/BugReportTool/packages.config +++ b/tools/BugReportTool/BugReportTool/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/tools/CleanUp_tool/CleanUp_tool.vcxproj b/tools/CleanUp_tool/CleanUp_tool.vcxproj index 5166ffcb93..ceed3a375a 100644 --- a/tools/CleanUp_tool/CleanUp_tool.vcxproj +++ b/tools/CleanUp_tool/CleanUp_tool.vcxproj @@ -6,7 +6,6 @@ Win32Proj {0995f59a-5074-42e4-afe4-6335a0368e8e} CleanUptool - 10.0 diff --git a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj index 51ae22a786..8c0be5b23e 100644 --- a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj +++ b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.vcxproj @@ -23,7 +23,6 @@ Win32Proj {ab0f7153-208e-433d-a14f-311e09fdc0a0} FancyZonesDrawLayoutTest - 10.0 diff --git a/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj b/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj index 06cc9201af..b8608dae2f 100644 --- a/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj +++ b/tools/FancyZones_zonable_tester/FancyZones_zonable_tester.vcxproj @@ -22,7 +22,6 @@ 16.0 {784E01FE-25D9-4E7B-9F2D-30B71B66FB05} FancyZoneszonabletester - 10.0 diff --git a/tools/MonitorReportTool/MonitorReportTool.vcxproj b/tools/MonitorReportTool/MonitorReportTool.vcxproj index bcd7b8874e..0d4dcfd25b 100644 --- a/tools/MonitorReportTool/MonitorReportTool.vcxproj +++ b/tools/MonitorReportTool/MonitorReportTool.vcxproj @@ -5,7 +5,6 @@ Win32Proj {0febafaf-cb77-41f0-8ef9-8e3ad4b4f842} MonitorReportTool - 10.0.19041.0 @@ -38,7 +37,6 @@ $(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\ PowerToys.$(ProjectName) diff --git a/tools/StylesReportTool/StylesReportTool.vcxproj b/tools/StylesReportTool/StylesReportTool.vcxproj index 6e3ee0449d..3611715a74 100644 --- a/tools/StylesReportTool/StylesReportTool.vcxproj +++ b/tools/StylesReportTool/StylesReportTool.vcxproj @@ -5,7 +5,6 @@ Win32Proj {0febafaf-cb77-41f0-8ef9-8e3ad4b4f842} StylesReportTool - 10.0.19041.0 @@ -38,7 +37,6 @@ $(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\ PowerToys.$(ProjectName) diff --git a/tools/WebcamReportTool/DirectShowUtils.h b/tools/WebcamReportTool/DirectShowUtils.h index 00e3a6e7c9..70cfcbaeec 100644 --- a/tools/WebcamReportTool/DirectShowUtils.h +++ b/tools/WebcamReportTool/DirectShowUtils.h @@ -9,8 +9,9 @@ // disable warning 26492 - Don't use const_cast to cast away const on winrt // disable warning 26493 - Don't use C-style casts // Disable 26497 for winrt - This function function-name could be marked constexpr if compile-time evaluation is desired. +// disable 26403 - Reset or explicitly delete an owner pointer #pragma warning(push) -#pragma warning(disable : 26471 26492 26493 26497) +#pragma warning(disable : 26471 26492 26493 26497 26403) #include #pragma warning(pop) diff --git a/tools/WebcamReportTool/WebcamReportTool.vcxproj b/tools/WebcamReportTool/WebcamReportTool.vcxproj index 3ea37ed909..78a81a0dca 100644 --- a/tools/WebcamReportTool/WebcamReportTool.vcxproj +++ b/tools/WebcamReportTool/WebcamReportTool.vcxproj @@ -13,7 +13,6 @@ WebcamReportTool - $(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\ $(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\ @@ -62,14 +61,14 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/tools/WebcamReportTool/main.cpp b/tools/WebcamReportTool/main.cpp index e0f0a625b4..adcb1f70ef 100644 --- a/tools/WebcamReportTool/main.cpp +++ b/tools/WebcamReportTool/main.cpp @@ -9,8 +9,9 @@ // disable warning 26492 - Don't use const_cast to cast away const // disable warning 26493 - Don't use C-style casts // Disable 26497 for winrt - This function function-name could be marked constexpr if compile-time evaluation is desired. +// disable 26403 - Reset or explicitly delete an owner pointer #pragma warning(push) -#pragma warning(disable : 26471 26492 26493 26497) +#pragma warning(disable : 26471 26492 26493 26497 26403) #include #pragma warning(pop) diff --git a/tools/WebcamReportTool/packages.config b/tools/WebcamReportTool/packages.config index 06e6b82e58..c92dd4bf0c 100644 --- a/tools/WebcamReportTool/packages.config +++ b/tools/WebcamReportTool/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/tools/build/video_conference_make_cab.ps1 b/tools/build/video_conference_make_cab.ps1 index b5c346e992..e580c32f30 100644 --- a/tools/build/video_conference_make_cab.ps1 +++ b/tools/build/video_conference_make_cab.ps1 @@ -4,7 +4,7 @@ param ( ) $PTRoot = "${PSScriptRoot}\..\.." -cd "$PTRoot\$arch\$configuration\modules\VideoConference\VideoConferenceVirtualDriver" +cd "$PTRoot\$arch\$configuration\VideoConferenceVirtualDriver" $ddf = Resolve-Path "$PTRoot\src\modules\videoconference\make_cab.ddf" makecab.exe /v0 /F $ddf | Out-Null Move-Item -Path driver\driver.cab -Destination VideoConference.cab -Force diff --git a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj index ad65447efc..4c67e7c93e 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj @@ -6,7 +6,6 @@ {64A80062-4D8B-4229-8A38-DFA1D7497749} Win32Proj $safeprojectname$ - 10.0 ModuleTemplate diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj index 36a002460d..11b4301ca5 100644 --- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj +++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj @@ -6,7 +6,6 @@ {64A80062-4D8B-4229-8A38-DFA1D7497749} Win32Proj templatenamespace - 10.0.19041.0 ModuleTemplateCompileTest @@ -36,13 +35,11 @@ true - $(SolutionDir)$(Platform)\$(Configuration)\modules\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\ModuleTemplate\ false - $(SolutionDir)$(Platform)\$(Configuration)\modules\ - $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + $(SolutionDir)$(Platform)\$(Configuration)\tests\ModuleTemplate\