From 084978c465cc36ea42612627d806bcc7dab0cfef Mon Sep 17 00:00:00 2001
From: Laszlo Nemeth <57342539+donlaci@users.noreply.github.com>
Date: Thu, 9 Jan 2025 12:19:02 +0100
Subject: [PATCH 1/2] [Settings] Add Workspaces' workspaces.json file to
 backup/restore list (#36714)

---
 .../Settings.UI.Library/backup_restore_settings.json           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/settings-ui/Settings.UI.Library/backup_restore_settings.json b/src/settings-ui/Settings.UI.Library/backup_restore_settings.json
index 84a03db71379..390df0bfb92c 100644
--- 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",

From 5ef918750d384b76d4db3b82fde8942396c6f3d5 Mon Sep 17 00:00:00 2001
From: leileizhang <leilzh@microsoft.com>
Date: Fri, 10 Jan 2025 01:45:12 +0800
Subject: [PATCH 2/2] [Localization] Fix loc pipeline to send downloaded
 localized files to TDBuild upon retry after failure (#36766)

---
 .pipelines/loc/loc.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pipelines/loc/loc.yml b/.pipelines/loc/loc.yml
index 2087e300eaf1..8d582c48305c 100644
--- 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