Skip to content

[main] Source code updates from dotnet/dotnet #18995

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.

Sign up for GitHub

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

Merged
dotnet-maestro merged 6 commits into from
Oct 14, 2025
Merged

[main] Source code updates from dotnet/dotnet #18995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78aa6ff
Backflow from https://github.com/dotnet/dotnet / 01abb3e build 286825
dotnet-maestro[bot] Oct 14, 2025
d1f5719
Merge main into darc-main-fafb5479-704e-4f32-851d-e37d9409d9d7
dotnet-maestro[bot] Oct 14, 2025
3124a21
Update dependencies from https://github.com/dotnet/dotnet build 286825
dotnet-maestro[bot] Oct 14, 2025
4e1199a
Merge branch 'main' into darc-main-fafb5479-704e-4f32-851d-e37d9409d9d7
T-Gro Oct 14, 2025
157892a
Apply patch from /run fantomas
actions-user Oct 14, 2025
e3c6405
Please maestro checks
T-Gro Oct 14, 2025
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
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="64d877a07af8c020fe9da6e721bc2258894f31ee" BarId="286279" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="01abb3ec5c4cbffec5b33e02156bd3d2a8913b04" BarId="286825" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25511-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
11 changes: 3 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,10 @@
<VisualStudioShellProjectsPackages>18.0.2077-preview.1</VisualStudioShellProjectsPackages>
<MicrosoftVisualStudioThreadingPackagesVersion>18.0.5</MicrosoftVisualStudioThreadingPackagesVersion>

<!-- Roslyn packages -->
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
<MicrosoftCodeAnalysisVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftVisualStudioLanguageServicesVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesVersion>
<!-- Roslyn packages. Rest is managed by maestro bot and is in the imported .Details.props file -->
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<!-- Roslyn for when we need to compile C# in tests. .dll hell caused by vstest makes newer version fail at runtime -->
<RoslynForTestingButNotForVSLayer>4.14.0</RoslynForTestingButNotForVSLayer>
<!-- Roslyn for when we need to compile C# in tests. .dll hell caused by vstest makes newer version fail at runtime -->
<RoslynForTestingButNotForVSLayer>4.14.0</RoslynForTestingButNotForVSLayer>
<!-- -->
<!-- Visual Studio Shell packages -->
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Service/ServiceAssemblyContent.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
10 changes: 5 additions & 5 deletions src/Compiler/Utilities/illib.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading