Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix policheck error #9311

Merged
merged 4 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion eng/policheck_exclusions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@
<!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->

<Exclusion Type="FolderPathFull">.DOTNET</Exclusion>
</PoliCheckExclusions>
<!-- 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>
<!-- 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>
2 changes: 1 addition & 1 deletion src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/AssemblyDependency/ResolveAssemblyReference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down