From f9d845706dc25bae1b14ba02957be134a3f24efd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jan 2026 02:08:12 +0000 Subject: [PATCH 1/4] Backflow from https://github.com/dotnet/dotnet / 887f3d5 build 297286 [[ commit created by automation ]] --- eng/Versions.props | 16 ++++++++-------- src/Compiler/Driver/FxResolver.fs | 2 +- src/Compiler/Facilities/CompilerLocation.fs | 1 + src/Compiler/Facilities/LanguageFeatures.fs | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index de9674c1fd5..5ad3a8a340a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,11 +15,11 @@ - servicing$(FSharpPreReleaseIteration) + alpha$(FSharpPreReleaseIteration) - 10 + 11 0 - 200 + 100 0 @@ -30,11 +30,11 @@ $(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion) $(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion) $(FSMajorVersion).$(FSMinorVersion).0.0 - 10.0.100.0 + 10.0.101.0 43 - 11 + 12 $(FSBuildVersion) $(FSRevisionVersion) $(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion) @@ -42,14 +42,14 @@ $(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion) - 10.0.100 + 10.0.101 $(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).* 15 - 1 + 2 $(FSBuildVersion) $(FSRevisionVersion) $(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion) @@ -59,7 +59,7 @@ 18 - 3 + 4 $(VSMajorVersion).0 $(VSMajorVersion).$(VSMinorVersion).0 $(VSAssemblyVersionPrefix).0 diff --git a/src/Compiler/Driver/FxResolver.fs b/src/Compiler/Driver/FxResolver.fs index c504d4cb77e..d98f002b184 100644 --- a/src/Compiler/Driver/FxResolver.fs +++ b/src/Compiler/Driver/FxResolver.fs @@ -412,7 +412,7 @@ type internal FxResolver match runningTfmOpt with | Some tfm -> tfm - | _ -> if isRunningOnCoreClr then "net10.0" else "net472" + | _ -> if isRunningOnCoreClr then "net11.0" else "net472" let trySdkRefsPackDirectory = lazy diff --git a/src/Compiler/Facilities/CompilerLocation.fs b/src/Compiler/Facilities/CompilerLocation.fs index 367a842a701..f99f9d9d4ca 100644 --- a/src/Compiler/Facilities/CompilerLocation.fs +++ b/src/Compiler/Facilities/CompilerLocation.fs @@ -123,6 +123,7 @@ module internal FSharpEnvironment = |] elif typeof.Assembly.GetName().Name = "System.Private.CoreLib" then [| + "net11.0" "net10.0" "net9.0" "net8.0" diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 09fbf5e5991..9d1f4819a8e 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -117,10 +117,11 @@ type LanguageVersion(versionText) = static let languageVersion80 = 8.0m static let languageVersion90 = 9.0m static let languageVersion100 = 10.0m + static let languageVersion110 = 11.0m static let previewVersion = 9999m // Language version when preview specified - static let defaultVersion = languageVersion100 // Language version when default specified + static let defaultVersion = languageVersion110 // Language version when default specified static let latestVersion = defaultVersion // Language version when latest specified - static let latestMajorVersion = languageVersion100 // Language version when latestmajor specified + static let latestMajorVersion = languageVersion110 // Language version when latestmajor specified static let validOptions = [| "preview"; "default"; "latest"; "latestmajor" |] @@ -135,6 +136,7 @@ type LanguageVersion(versionText) = languageVersion80 languageVersion90 languageVersion100 + languageVersion110 |] static let features = @@ -241,6 +243,12 @@ type LanguageVersion(versionText) = LanguageFeature.ReturnFromFinal, languageVersion100 LanguageFeature.ErrorOnInvalidDeclsInTypeDefinitions, languageVersion100 + // F# 11.0 + // Put stabilized features here for F# 11.0 previews via .NET SDK preview channels + + // Difference between languageVersion110 and preview - 11.0 gets turned on automatically by picking a preview .NET 11 SDK + // previewVersion is only when "preview" is specified explicitly in project files and users also need a preview SDK + // F# preview (still preview in 10.0) LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work ] @@ -268,6 +276,8 @@ type LanguageVersion(versionText) = | "9" -> languageVersion90 | "10.0" | "10" -> languageVersion100 + | "11.0" + | "11" -> languageVersion110 | _ -> 0m let specified = getVersionFromString versionText From 3feee3d490ef29004a03cae14e3107d5b2c08639 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jan 2026 02:08:12 +0000 Subject: [PATCH 2/4] Update dependencies --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3afe10a80ce..6be23d90c2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild From 441b53efe8dc24e4a15fcd268bd898db9ed2bf69 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Thu, 15 Jan 2026 09:18:54 +0100 Subject: [PATCH 3/4] Update langversionhelp with new F# versions --- .../fsi/langversion/langversionhelp.437.1033.bsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl index 0aa857e7a0e..5bd37c43190 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl @@ -10,4 +10,5 @@ latestmajor 7.0 8.0 9.0 -10.0 (Default) \ No newline at end of file +10.0 +11.0 (Default) From c40921781730e0e0b0565a00369a2c990a9e8806 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Fri, 16 Jan 2026 12:40:33 +0100 Subject: [PATCH 4/4] Update azure-pipelines-PR.yml --- azure-pipelines-PR.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 83919f27499..53a8ea14c33 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -891,6 +891,8 @@ stages: - script: dotnet tool restore displayName: Restore dotnet tools - pwsh: .\tests\ILVerify\ilverify.ps1 + env: + SKIP_NETCURRENT_FSC_BUILD: true displayName: Run ILVerify workingDirectory: $(Build.SourcesDirectory)