diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed82e866e0..52aac9ef1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 959c6e0803..9a996ef009 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,15 +99,10 @@ 18.0.2077-preview.1 18.0.5 - - 5.0.0-2.25480.7 - 5.0.0-2.25480.7 - 5.0.0-2.25480.7 - 5.0.0-2.25480.7 - 5.0.0-2.25480.7 + 2.0.28 - - 4.14.0 + + 4.14.0 $(MicrosoftVisualStudioShellPackagesVersion) diff --git a/src/Compiler/Service/ServiceAssemblyContent.fs b/src/Compiler/Service/ServiceAssemblyContent.fs index f1b3bf2ee1..8c58565125 100644 --- a/src/Compiler/Service/ServiceAssemblyContent.fs +++ b/src/Compiler/Service/ServiceAssemblyContent.fs @@ -16,7 +16,7 @@ open FSharp.Compiler.Symbols open FSharp.Compiler.Syntax module Utils = - let replaceLastIdentToDisplayName idents (displayName: string) = + let replaceLastIdentToDisplayName (idents: string array) (displayName: string) = match idents |> Array.tryFindIndexBack (fun i -> displayName.StartsWith(i, System.StringComparison.Ordinal)) with | Some x when x = idents.Length - 1 -> idents |> Array.replace (idents.Length - 1) displayName | Some x -> diff --git a/src/Compiler/Utilities/illib.fs b/src/Compiler/Utilities/illib.fs index aa83558632..e10a84f8ea 100644 --- a/src/Compiler/Utilities/illib.fs +++ b/src/Compiler/Utilities/illib.fs @@ -96,22 +96,22 @@ module internal PervasiveAutoOpens = type String with - member inline x.StartsWithOrdinal value = + member inline x.StartsWithOrdinal(value: string) = x.StartsWith(value, StringComparison.Ordinal) - member inline x.EndsWithOrdinal value = + member inline x.EndsWithOrdinal(value: string) = x.EndsWith(value, StringComparison.Ordinal) - member inline x.EndsWithOrdinalIgnoreCase value = + member inline x.EndsWithOrdinalIgnoreCase(value: string) = x.EndsWith(value, StringComparison.OrdinalIgnoreCase) member inline x.IndexOfOrdinal(value: string) = x.IndexOf(value, StringComparison.Ordinal) - member inline x.IndexOfOrdinal(value, startIndex) = + member inline x.IndexOfOrdinal(value: string, startIndex) = x.IndexOf(value, startIndex, StringComparison.Ordinal) - member inline x.IndexOfOrdinal(value, startIndex, count) = + member inline x.IndexOfOrdinal(value: string, startIndex, count) = x.IndexOf(value, startIndex, count, StringComparison.Ordinal) /// Get an initialization hole