Test dwld

Revert "Remove to speed up"
This reverts commit c7d66adb58.
2026-01-06 20:37:02 +01:00 · 2024-02-02 10:43:41 +01:00 · 2024-02-01 18:27:09 +01:00 · 2024-02-01 18:26:53 +01:00 · 2024-02-01 17:43:04 +01:00 · 2024-02-01 16:31:29 +01:00
3 changed files with 147 additions and 163 deletions
--- a/.pipelines/release.yml
+++ b/.pipelines/release.yml
@@ -445,8 +445,38 @@ extends:

        # Publishing the GPO files
        - pwsh: |-
-            New-Item "$(Build.ArtifactStagingDirectory)/gpo" -Type Directory
-            Copy-Item src\gpo\assets\* "$(Build.ArtifactStagingDirectory)/gpo" -Recurse
          displayName: Stage the GPO files
+    - stage: PostBuild
+      displayName: Post-build
+      pool:
+        name: SHINE-INT-L
+        image: SHINE-VS17-Latest
+        os: windows
+      jobs:
+      - job: A
+        steps:
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            buildType: 'current'
+            targetPath: '$(Pipeline.Workspace)' # string. Alias: path | downloadPath. Required. Destination directory. Default: $(Pipeline.Workspace).
+        - task: PowerShell@2
+          displayName: 'Calculating SHA256 hash'
+          inputs:
+            targetType: 'inline'
+            script: |
+              $p = "$(System.ArtifactsDirectory)\";
+              $pp = "$(System.DefaultWorkingDirectory)\";
+              $ppp = "$(Build.ArtifactStagingDirectory)\";
+              
+              echo $p
+              echo $pp
+              echo $ppp
+              Get-ChildItem $p
+              echo "AAAAAAAAAAAAAAAAAAAAA"
+              Get-ChildItem $pp
+              echo "AAAAAAAAAAAAAAAAAAAAA"
+              Get-ChildItem $ppp
+              
+            pwsh: true

 ...
--- a/src/settings-ui/Settings.UI/Services/NavigationService.cs
+++ b/src/settings-ui/Settings.UI/Services/NavigationService.cs
@@ -59,23 +59,16 @@ namespace Microsoft.PowerToys.Settings.UI.Services

        public static bool Navigate(Type pageType, object parameter = null, NavigationTransitionInfo infoOverride = null)
        {
-            if (pageType != null)
+            // Don't open the same page multiple times
+            if (Frame.Content?.GetType() != pageType || (parameter != null && !parameter.Equals(lastParamUsed)))
            {
-                // Don't open the same page multiple times
-                if (Frame.Content?.GetType() != pageType || (parameter != null && !parameter.Equals(lastParamUsed)))
+                var navigationResult = Frame.Navigate(pageType, parameter, infoOverride);
+                if (navigationResult)
                {
-                    var navigationResult = Frame.Navigate(pageType, parameter, infoOverride);
-                    if (navigationResult)
-                    {
-                        lastParamUsed = parameter;
-                    }
+                    lastParamUsed = parameter;
+                }

-                    return navigationResult;
-                }
-                else
-                {
-                    return false;
-                }
+                return navigationResult;
            }
            else
            {
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
@@ -106,163 +106,124 @@
                <NavigationViewItemSeparator />

                <NavigationViewItem
-                    Content="File Explorer Add-ons"
-                    Icon="{ui:FontIcon Glyph=&#xEC50;}"
-                    SelectsOnInvoked="False">
-                    <NavigationViewItem.MenuItems>
-                        <NavigationViewItem
-                            helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                            Content="File Explorer Thumbnails"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
-                        <NavigationViewItem
-                            helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                            Content="File Explorer Preview Pane"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_Peek"
-                            helpers:NavHelper.NavigateTo="views:PeekPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
-                    </NavigationViewItem.MenuItems>
-                </NavigationViewItem>
+                    x:Uid="Shell_AlwaysOnTop"
+                    helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />

                <NavigationViewItem
-                    Content="Mouse &amp; Keyboard"
-                    Icon="{ui:FontIcon Glyph=&#xE961;}"
-                    SelectsOnInvoked="False">
-                    <NavigationViewItem.MenuItems>
-                        <NavigationViewItem
-                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                            Content="Find My Mouse"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FindMyMouse.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_KeyboardManager"
-                            helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
-                        <NavigationViewItem
-                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                            Content="Mouse Highlighter"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseHighlighter.png}" />
-                        <NavigationViewItem
-                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                            Content="Mouse Jump"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseJump.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_MouseWithoutBorders"
-                            helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_QuickAccent"
-                            helpers:NavHelper.NavigateTo="views:PowerAccentPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
-                    </NavigationViewItem.MenuItems>
-                </NavigationViewItem>
-
+                    x:Uid="Shell_Awake"
+                    helpers:NavHelper.NavigateTo="views:AwakePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />

                <NavigationViewItem
-                    Content="System"
-                    Icon="{ui:FontIcon Glyph=&#xE770;}"
-                    SelectsOnInvoked="False">
-                    <NavigationViewItem.MenuItems>
-                        <NavigationViewItem
-                            x:Uid="Shell_Awake"
-                            helpers:NavHelper.NavigateTo="views:AwakePage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_CmdNotFound"
-                            helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_EnvironmentVariables"
-                            helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_Hosts"
-                            helpers:NavHelper.NavigateTo="views:HostsPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_RegistryPreview"
-                            helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_PastePlain"
-                            helpers:NavHelper.NavigateTo="views:PastePlainPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}" />
-                    </NavigationViewItem.MenuItems>
-                </NavigationViewItem>
+                    x:Uid="Shell_ColorPicker"
+                    helpers:NavHelper.NavigateTo="views:ColorPickerPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />

                <NavigationViewItem
-                    Content="Utilities"
-                    Icon="{ui:FontIcon Glyph=&#xE8B7;}"
-                    SelectsOnInvoked="False">
-                    <NavigationViewItem.MenuItems>
-                        <NavigationViewItem
-                            x:Uid="Shell_ColorPicker"
-                            helpers:NavHelper.NavigateTo="views:ColorPickerPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_FileLocksmith"
-                            helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_ImageResizer"
-                            helpers:NavHelper.NavigateTo="views:ImageResizerPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_PowerRename"
-                            helpers:NavHelper.NavigateTo="views:PowerRenamePage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_MeasureTool"
-                            helpers:NavHelper.NavigateTo="views:MeasureToolPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_PowerLauncher"
-                            helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
-                    </NavigationViewItem.MenuItems>
-                </NavigationViewItem>
+                    x:Uid="Shell_CmdNotFound"
+                    helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />

                <NavigationViewItem
-                    Content="Windowing"
-                    Icon="{ui:FontIcon Glyph=&#xEE40;}"
-                    SelectsOnInvoked="False">
-                    <NavigationViewItem.MenuItems>
-                        <NavigationViewItem
-                            x:Uid="Shell_AlwaysOnTop"
-                            helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_CropAndLock"
-                            helpers:NavHelper.NavigateTo="views:CropAndLockPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_FancyZones"
-                            helpers:NavHelper.NavigateTo="views:FancyZonesPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
-                    </NavigationViewItem.MenuItems>
-                </NavigationViewItem>
+                    x:Uid="Shell_CropAndLock"
+                    helpers:NavHelper.NavigateTo="views:CropAndLockPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />

-                <NavigationViewItemSeparator />
                <NavigationViewItem
-                    Content="Maintenance mode"
-                    Icon="{ui:FontIcon Glyph=&#xE81B;}"
-                    SelectsOnInvoked="False">
-                    <NavigationViewItem.MenuItems>
-                        <NavigationViewItem
-                            helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                            Content="Mouse Crosshairs"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseCrossHairs.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_TextExtractor"
-                            helpers:NavHelper.NavigateTo="views:PowerOcrPage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
-                        <NavigationViewItem
-                            x:Uid="Shell_VideoConference"
-                            helpers:NavHelper.NavigateTo="views:VideoConferencePage"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
-                            IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
-                    </NavigationViewItem.MenuItems>
-                </NavigationViewItem>
+                    x:Uid="Shell_EnvironmentVariables"
+                    helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_FancyZones"
+                    helpers:NavHelper.NavigateTo="views:FancyZonesPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_PowerPreview"
+                    helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_FileLocksmith"
+                    helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_Hosts"
+                    helpers:NavHelper.NavigateTo="views:HostsPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_ImageResizer"
+                    helpers:NavHelper.NavigateTo="views:ImageResizerPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_KeyboardManager"
+                    helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_MouseUtilities"
+                    helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_MouseWithoutBorders"
+                    helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_PastePlain"
+                    helpers:NavHelper.NavigateTo="views:PastePlainPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_Peek"
+                    helpers:NavHelper.NavigateTo="views:PeekPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_PowerRename"
+                    helpers:NavHelper.NavigateTo="views:PowerRenamePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
+                <NavigationViewItem
+                    x:Uid="Shell_PowerLauncher"
+                    helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_QuickAccent"
+                    helpers:NavHelper.NavigateTo="views:PowerAccentPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_RegistryPreview"
+                    helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_MeasureTool"
+                    helpers:NavHelper.NavigateTo="views:MeasureToolPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_ShortcutGuide"
+                    helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_TextExtractor"
+                    helpers:NavHelper.NavigateTo="views:PowerOcrPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_VideoConference"
+                    helpers:NavHelper.NavigateTo="views:VideoConferencePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
+                    IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
            </NavigationView.MenuItems>
            <NavigationView.PaneFooter>
                <StackPanel Orientation="Vertical">
Author	SHA1	Message	Date
Stefan Markovic	80ff5f0b74	Test dwld	2024-02-02 10:43:41 +01:00
Stefan Markovic	fe502b442a	Revert "Remove to speed up" This reverts commit `c7d66adb58`.	2024-02-01 18:27:09 +01:00
Stefan Markovic	63d6228d83	Revert "more cleanp" This reverts commit `16c774774f`.	2024-02-01 18:26:53 +01:00
Stefan Markovic	16c774774f	more cleanp	2024-02-01 17:43:04 +01:00
Stefan Markovic	c251a70a3f	asd	2024-02-01 16:31:29 +01:00
Stefan Markovic	c7d66adb58	Remove to speed up	2024-02-01 16:31:22 +01:00
Stefan Markovic	2a218a2990	Test	2024-02-01 11:59:15 +01:00