Merge remote-tracking branch 'origin/main' into user/vanzue/env-expand

microsoft · Jan 10, 2025 · 77d5076 · 77d5076
2 parents 88d85a4 + 5ef9187
commit 77d5076
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.pipelines/loc/loc.yml b/.pipelines/loc/loc.yml
@@ -32,9 +32,9 @@ steps:
     TDBuildServiceConnection: $(TouchdownServiceConnection)
     authType: SubjectNameIssuer
     resourceFilePath: |
-     **\Resources.resx
-     **\Resource.resx
-     **\Resources.resw
+     src\**\Resources.resx
+     src\**\Resource.resx
+     src\**\Resources.resw
     outputDirectoryRoot: LocOutput
     appendRelativeDir: true
     pseudoSetting: Included

diff --git a/src/settings-ui/Settings.UI.Library/backup_restore_settings.json b/src/settings-ui/Settings.UI.Library/backup_restore_settings.json
@@ -5,7 +5,8 @@
     "*settings.json",
     "*FancyZones\\custom-layouts.json",
     "*FancyZones\\layout-hotkeys.json",
-    "*FancyZones\\layout-templates.json"
+    "*FancyZones\\layout-templates.json",
+    "*Workspaces\\workspaces.json"
   ],
   "IgnoreFiles": [
     "*PowerToys\\log_settings.json",