Merge branch 'main' into dev/zhaopengwang/test/37733-ui-test-fancyzon…

…es-editor
microsoft · Mar 5, 2025 · 3bf27cf · 3bf27cf · github-actions · Mar 5, 2025
2 parents 1491a93 + fc94cd7
commit 3bf27cf
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 112 deletions.
diff --git a/...tions/configuration.vsEnterprise.dsc.yaml → .config/configuration.vsEnterprise.winget b/...tions/configuration.vsEnterprise.dsc.yaml → .config/configuration.vsEnterprise.winget
diff --git a/...ons/configuration.vsProfessional.dsc.yaml → .config/configuration.vsProfessional.winget b/...ons/configuration.vsProfessional.dsc.yaml → .config/configuration.vsProfessional.winget
diff --git a/.configurations/configuration.dsc.yaml → .config/configuration.winget b/.configurations/configuration.dsc.yaml → .config/configuration.winget
diff --git a/README.md b/README.md
diff --git a/doc/devdocs/settingsv2/dsc-configure.md b/doc/devdocs/settingsv2/dsc-configure.md
@@ -94,5 +94,5 @@ Note that we've supplied `Debug` option, so a `%TEMP\PowerToys.DSC.TestConfigure
 Finally, you can test it with winget by invoking it as such:
 
 ```ps
-winget configure .\configuration.dsc.yaml --accept-configuration-agreements --disable-interactivity
+winget configure .\configuration.winget --accept-configuration-agreements --disable-interactivity
 ```
diff --git a/src/dsc/Microsoft.PowerToys.Configure/examples/README.md b/src/dsc/Microsoft.PowerToys.Configure/examples/README.md
@@ -5,22 +5,22 @@ This folder contains samples of DSC files that can be used to configure PowerToy
 > [!NOTE]
 > PowerToys DSC user documentation can be found on [Learn Microsoft PowerToys documentation](https://aka.ms/powertoys-docs-dsc-configure).
 
-### [configuration.dsc.yaml](./configuration.dsc.yaml)
+### [configuration.winget](./configuration.winget)
 
 Sample configuration file that changes the enabled state of some modules, changes an integer setting and a hotkey setting.
 
-### [installAndConfiguration.dsc.yaml](./installAndConfiguration.dsc.yaml)
+### [installAndConfiguration.winget](./installAndConfiguration.winget)
 
-Installs PowerToys and applies configuration.dsc.yaml to it.
+Installs PowerToys and applies configuration.winget to it.
 
-### [enableAllModules.dsc.yaml](./enableAllModules.dsc.yaml)
+### [enableAllModules.winget](./enableAllModules.winget)
 
 Enables all PowerToys utilities.
 
-### [disableAllModules.dsc.yaml](./disableAllModules.dsc.yaml)
+### [disableAllModules.winget](./disableAllModules.winget)
 
 Disables all PowerToys utilities.
 
-### [configureLauncherPlugins.dsc.yaml](./configureLauncherPlugins.dsc.yaml)
+### [configureLauncherPlugins.winget](./configureLauncherPlugins.winget)
 
 Enables PowerToys Run and all its plugins and changes action keyword and global state for the Program plugin.
diff --git a/...Configure/examples/configuration.dsc.yaml → ...s.Configure/examples/configuration.winget b/...Configure/examples/configuration.dsc.yaml → ...s.Configure/examples/configuration.winget
diff --git a/...xamples/configureLauncherPlugins.dsc.yaml → .../examples/configureLauncherPlugins.winget b/...xamples/configureLauncherPlugins.dsc.yaml → .../examples/configureLauncherPlugins.winget
diff --git a/...igure/examples/disableAllModules.dsc.yaml → ...nfigure/examples/disableAllModules.winget b/...igure/examples/disableAllModules.dsc.yaml → ...nfigure/examples/disableAllModules.winget
diff --git a/...figure/examples/enableAllModules.dsc.yaml → ...onfigure/examples/enableAllModules.winget b/...figure/examples/enableAllModules.dsc.yaml → ...onfigure/examples/enableAllModules.winget
diff --git a/...examples/installAndConfiguration.dsc.yaml → ...e/examples/installAndConfiguration.winget b/...examples/installAndConfiguration.dsc.yaml → ...e/examples/installAndConfiguration.winget
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -487,10 +487,10 @@ private async void DeleteLayout(FrameworkElement element)
                     }
                 }
 
+                model.Delete();
                 App.FancyZonesEditorIO.SerializeAppliedLayouts();
                 App.FancyZonesEditorIO.SerializeCustomLayouts();
                 App.FancyZonesEditorIO.SerializeDefaultLayouts();
-                model.Delete();
             }
         }