From e2bcc71d45bc19122525691fd40ed8e3e2f3a504 Mon Sep 17 00:00:00 2001 From: Next Turn <45985406+NextTurn@users.noreply.github.com> Date: Wed, 26 Feb 2020 14:50:23 +0800 Subject: [PATCH] Rename a parameter (#32841) --- .../src/System/Runtime/Loader/LibraryNameVariation.Unix.cs | 2 +- .../src/System/Runtime/Loader/LibraryNameVariation.Windows.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Unix.cs index 322c751..c63ff94 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Unix.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Unix.cs @@ -16,7 +16,7 @@ namespace System.Runtime.Loader private const string LibraryNameSuffix = ".so"; #endif - internal static IEnumerable DetermineLibraryNameVariations(string libName, bool isRelativePath, bool forSystemApi = false) + internal static IEnumerable DetermineLibraryNameVariations(string libName, bool isRelativePath, bool forOSLoader = false) { // This is a copy of the logic in DetermineLibNameVariations in dllimport.cpp in CoreCLR diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Windows.cs index f1f226e..902e878 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/LibraryNameVariation.Windows.cs @@ -10,15 +10,15 @@ namespace System.Runtime.Loader { private const string LibraryNameSuffix = ".dll"; - internal static IEnumerable DetermineLibraryNameVariations(string libName, bool isRelativePath, bool forSystemApi = false) + internal static IEnumerable DetermineLibraryNameVariations(string libName, bool isRelativePath, bool forOSLoader = false) { // This is a copy of the logic in DetermineLibNameVariations in dllimport.cpp in CoreCLR yield return new LibraryNameVariation(string.Empty, string.Empty); - // Follow LoadLibrary rules if forSystemApi is true + // Follow LoadLibrary rules if forOSLoader is true if (isRelativePath && - (!forSystemApi || libName.Contains('.') && !libName.EndsWith('.')) && + (!forOSLoader || libName.Contains('.') && !libName.EndsWith('.')) && !libName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && !libName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) { -- 2.7.4