From 78aa6ffff912299e7ef2032ecb114ffb965b000d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Oct 2025 02:07:37 +0000 Subject: [PATCH 1/4] Backflow from https://github.com/dotnet/dotnet / 01abb3e build 286825 [[ commit created by automation ]] --- src/Compiler/Service/ServiceAssemblyContent.fs | 2 +- src/Compiler/Utilities/illib.fs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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..a8ed29f7fe 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 From 3124a210157efca2630aca7d92cc017bd593648c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Oct 2025 02:07:38 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/dotnet build 286825 No dependency updates to commit --- eng/Version.Details.props | 18 ++++++++++++++++++ eng/Version.Details.xml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b3b3681c41..1304447c56 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -17,6 +17,15 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 9.0.0 + + 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 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 11.0.0-beta.25509.1 @@ -40,6 +49,15 @@ This file should be imported by eng/Versions.props $(SystemDiagnosticsDiagnosticSourcePackageVersion) $(SystemReflectionMetadataPackageVersion) $(SystemThreadingTasksDataflowPackageVersion) + + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisCompilersPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisEditorFeaturesPackageVersion) + $(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion) + $(MicrosoftCodeAnalysisFeaturesPackageVersion) + $(MicrosoftVisualStudioLanguageServicesPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bebc4999d8..0dfd9ed2fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild From 157892a84af13279d32c782a61a0e88e08cb03da Mon Sep 17 00:00:00 2001 From: GH Actions Date: Tue, 14 Oct 2025 08:33:13 +0000 Subject: [PATCH 3/4] Apply patch from /run fantomas --- src/Compiler/Utilities/illib.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Compiler/Utilities/illib.fs b/src/Compiler/Utilities/illib.fs index a8ed29f7fe..e10a84f8ea 100644 --- a/src/Compiler/Utilities/illib.fs +++ b/src/Compiler/Utilities/illib.fs @@ -96,13 +96,13 @@ module internal PervasiveAutoOpens = type String with - member inline x.StartsWithOrdinal (value:string) = + member inline x.StartsWithOrdinal(value: string) = x.StartsWith(value, StringComparison.Ordinal) - member inline x.EndsWithOrdinal (value:string) = + member inline x.EndsWithOrdinal(value: string) = x.EndsWith(value, StringComparison.Ordinal) - member inline x.EndsWithOrdinalIgnoreCase (value:string) = + member inline x.EndsWithOrdinalIgnoreCase(value: string) = x.EndsWith(value, StringComparison.OrdinalIgnoreCase) member inline x.IndexOfOrdinal(value: string) = From e3c640578f0a9a1768ff6be517366f6cd6af3a42 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 14 Oct 2025 12:48:27 +0000 Subject: [PATCH 4/4] Please maestro checks --- eng/Versions.props | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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)