From 559029e7a0f6c9df8b0b3ac5060b930ad36f6106 Mon Sep 17 00:00:00 2001
From: Jenny Bai <v-jennybai@microsoft.com>
Date: Thu, 28 Sep 2023 13:17:52 +0800
Subject: [PATCH 1/4] Fix Policheck Errors

---
 eng/policheck_exclusions.xml                             | 6 +++++-
 src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs | 2 +-
 src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/eng/policheck_exclusions.xml b/eng/policheck_exclusions.xml
index c5ed5390edf..301b82442fb 100644
--- a/eng/policheck_exclusions.xml
+++ b/eng/policheck_exclusions.xml
@@ -10,4 +10,8 @@
   <!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
 
   <Exclusion Type="FolderPathFull">.DOTNET</Exclusion>
-</PoliCheckExclusions>
\ No newline at end of file
+  <!-- This file contains entity names including the non-geopolitical captical and spades. Leave them unchanged and skip the file -->
+  <Exclusion Type="FileName">OLDVSPROJECTFILEREADER.CS</Exclusion>
+  <!-- A French word is scannded as English derogatory word. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1889125  -->
+  <Exclusion Type="FileName">STRINGS.FR.XLF</Exclusion>
+</PoliCheckExclusions>
diff --git a/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs b/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs
index 19aab4b83e6..357042d5147 100644
--- a/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs
+++ b/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs
@@ -171,7 +171,7 @@ private static bool IsMatch(AssemblyName suggestedRedirect, string name, string
             var cultureString = suggestedRedirect.CultureName;
             if (String.IsNullOrEmpty(cultureString))
             {
-                // We use "neutral" for "Invariant Language (Invariant Country)" in assembly names.
+                // We use "neutral" for "Invariant Language (Invariant Country/Region)" in assembly names.
                 cultureString = "neutral";
             }
 
diff --git a/src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs b/src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs
index 45d87afb04c..69e8109a20b 100644
--- a/src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs
+++ b/src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs
@@ -1207,7 +1207,7 @@ quiet at the engine level.
 
                                         assemblyIdentityAttributes.Add(new XAttribute("name", idealRemappingPartialAssemblyName.Name));
 
-                                        // We use "neutral" for "Invariant Language (Invariant Country)" in assembly names.
+                                        // We use "neutral" for "Invariant Language (Invariant Country/Region)" in assembly names.
                                         var cultureString = idealRemappingPartialAssemblyName.CultureName;
                                         assemblyIdentityAttributes.Add(new XAttribute("culture", String.IsNullOrEmpty(idealRemappingPartialAssemblyName.CultureName) ? "neutral" : idealRemappingPartialAssemblyName.CultureName));
 

From ce80afc91caae5a7ba69da83487f5d5bcb85abf3 Mon Sep 17 00:00:00 2001
From: Jenny Bai <v-jennybai@microsoft.com>
Date: Thu, 28 Sep 2023 14:30:01 +0800
Subject: [PATCH 2/4] Fix the file name

---
 eng/policheck_exclusions.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/policheck_exclusions.xml b/eng/policheck_exclusions.xml
index 301b82442fb..a95c9472566 100644
--- a/eng/policheck_exclusions.xml
+++ b/eng/policheck_exclusions.xml
@@ -10,8 +10,8 @@
   <!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
 
   <Exclusion Type="FolderPathFull">.DOTNET</Exclusion>
-  <!-- This file contains entity names including the non-geopolitical captical and spades. Leave them unchanged and skip the file -->
+  <!-- This file contains entity names that were written out by the XML writer in the VS.NET 2002/2003 project system. Leave them unchanged and skip the file -->
   <Exclusion Type="FileName">OLDVSPROJECTFILEREADER.CS</Exclusion>
   <!-- A French word is scannded as English derogatory word. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1889125  -->
-  <Exclusion Type="FileName">STRINGS.FR.XLF</Exclusion>
+  <Exclusion Type="FileName">SRC\MSBUILD\RESOURCES\XLF\STRINGS.FR.XLF</Exclusion>
 </PoliCheckExclusions>

From b39a233992598d2459d96e6cac83cbd8fe256feb Mon Sep 17 00:00:00 2001
From: Jenny Bai <v-jennybai@microsoft.com>
Date: Thu, 28 Sep 2023 15:28:57 +0800
Subject: [PATCH 3/4] Change FileName to FolderPathFull

---
 eng/policheck_exclusions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/policheck_exclusions.xml b/eng/policheck_exclusions.xml
index a95c9472566..c7f22653274 100644
--- a/eng/policheck_exclusions.xml
+++ b/eng/policheck_exclusions.xml
@@ -13,5 +13,5 @@
   <!-- This file contains entity names that were written out by the XML writer in the VS.NET 2002/2003 project system. Leave them unchanged and skip the file -->
   <Exclusion Type="FileName">OLDVSPROJECTFILEREADER.CS</Exclusion>
   <!-- A French word is scannded as English derogatory word. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1889125  -->
-  <Exclusion Type="FileName">SRC\MSBUILD\RESOURCES\XLF\STRINGS.FR.XLF</Exclusion>
+  <Exclusion Type="FolderPathFull">SRC\MSBUILD\RESOURCES\XLF\STRINGS.FR.XLF</Exclusion>
 </PoliCheckExclusions>

From 060d176daaae9c5088b78c59667e7aee26b348d1 Mon Sep 17 00:00:00 2001
From: Jenny Bai <v-jennybai@microsoft.com>
Date: Mon, 9 Oct 2023 16:39:44 +0800
Subject: [PATCH 4/4] Skip the translated files currently

---
 eng/policheck_exclusions.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/policheck_exclusions.xml b/eng/policheck_exclusions.xml
index c7f22653274..841de0e4f01 100644
--- a/eng/policheck_exclusions.xml
+++ b/eng/policheck_exclusions.xml
@@ -12,6 +12,6 @@
   <Exclusion Type="FolderPathFull">.DOTNET</Exclusion>
   <!-- This file contains entity names that were written out by the XML writer in the VS.NET 2002/2003 project system. Leave them unchanged and skip the file -->
   <Exclusion Type="FileName">OLDVSPROJECTFILEREADER.CS</Exclusion>
-  <!-- A French word is scannded as English derogatory word. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1889125  -->
-  <Exclusion Type="FolderPathFull">SRC\MSBUILD\RESOURCES\XLF\STRINGS.FR.XLF</Exclusion>
+  <!-- Since only support the locale en-us in our repo, skip the translated files currently. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1889125  -->
+  <Exclusion Type="FileType">.XLF</Exclusion>
 </PoliCheckExclusions>