Skip to content

Commit 87b844b

Browse files
JaynieBaiMichalPavlik
authored andcommitted
Fix policheck error (#9311)
Fixes policheck:Error Changes Made Skip the non en-us locale resource files. Skip the file that contains the specified entity names in the deprecated folder Change country to country/region based on https://policheck.microsoft.com/Pages/TermInfo.aspx?LCID=9&TermID=79570 Testing Test with MSBuild pipeline build https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=8509007&view=logs&j=7d9eef18-6720-5c1f-4d30-89d7b76728e9&t=c5a86041-9185-53e8-42a2-1cadc4486f0d&l=5251. There are no active results now.
1 parent 3ee6aef commit 87b844b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

eng/policheck_exclusions.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@
1010
<!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
1111

1212
<Exclusion Type="FolderPathFull">.DOTNET</Exclusion>
13-
</PoliCheckExclusions>
13+
<!-- 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 -->
14+
<Exclusion Type="FileName">OLDVSPROJECTFILEREADER.CS</Exclusion>
15+
<!-- Since only support the locale en-us in our repo, skip the translated files currently. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1889125 -->
16+
<Exclusion Type="FileType">.XLF</Exclusion>
17+
</PoliCheckExclusions>

src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private static bool IsMatch(AssemblyName suggestedRedirect, string name, string
171171
var cultureString = suggestedRedirect.CultureName;
172172
if (String.IsNullOrEmpty(cultureString))
173173
{
174-
// We use "neutral" for "Invariant Language (Invariant Country)" in assembly names.
174+
// We use "neutral" for "Invariant Language (Invariant Country/Region)" in assembly names.
175175
cultureString = "neutral";
176176
}
177177

src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ quiet at the engine level.
12071207

12081208
assemblyIdentityAttributes.Add(new XAttribute("name", idealRemappingPartialAssemblyName.Name));
12091209

1210-
// We use "neutral" for "Invariant Language (Invariant Country)" in assembly names.
1210+
// We use "neutral" for "Invariant Language (Invariant Country/Region)" in assembly names.
12111211
var cultureString = idealRemappingPartialAssemblyName.CultureName;
12121212
assemblyIdentityAttributes.Add(new XAttribute("culture", String.IsNullOrEmpty(idealRemappingPartialAssemblyName.CultureName) ? "neutral" : idealRemappingPartialAssemblyName.CultureName));
12131213

0 commit comments

Comments
 (0)