Skip to content

Commit ccc636d

Browse files
authored
net9.0 to net10.0 (#18840)
1 parent 9b3a42a commit ccc636d

File tree

36 files changed

+130
-135
lines changed

36 files changed

+130
-135
lines changed

DEVGUIDE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ To use your custom build of `Fsc`, add the `DotnetFscCompilerPath` property to y
136136

137137
```xml
138138
<PropertyGroup>
139-
<DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net9.0\fsc.dll</DotnetFscCompilerPath>
139+
<DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net10.0\fsc.dll</DotnetFscCompilerPath>
140140
</PropertyGroup>
141141
```
142142

@@ -277,9 +277,9 @@ dotnet test tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fs
277277
These are IL baseline tests for the core assemblies of the compiler (FSharp.Core and FSharp.Compiler.Service). The baselines are located in the `tests/ILVerify` folder and look like:
278278

279279
```
280-
ilverify_FSharp.Compiler.Service_Debug_net9.0.bsl
280+
ilverify_FSharp.Compiler.Service_Debug_net10.0.bsl
281281
ilverify_FSharp.Compiler.Service_Debug_netstandard2.0.bsl
282-
ilverify_FSharp.Compiler.Service_Release_net9.0.bsl
282+
ilverify_FSharp.Compiler.Service_Release_net10.0.bsl
283283
ilverify_FSharp.Compiler.Service_Release_netstandard2.0.bsl
284284
ilverify_FSharp.Core_Debug_netstandard2.0.bsl
285285
ilverify_FSharp.Core_Debug_netstandard2.1.bsl

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<LangVersion Condition="'$(FSharpLangVersion)' != ''">$(FSharpLangVersion)</LangVersion>
77
<RepoRoot Condition="'$(RepoRoot)' == ''">$(MSBuildThisFileDirectory)</RepoRoot>
88
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
9-
<FSharpNetCoreProductDefaultTargetFramework>net9.0</FSharpNetCoreProductDefaultTargetFramework>
9+
<FSharpNetCoreProductDefaultTargetFramework>net10.0</FSharpNetCoreProductDefaultTargetFramework>
1010
<IgnoreMibc Condition="'$(IgnoreMibc)' == ''">$(DotNetBuildSourceOnly)</IgnoreMibc>
1111
<!-- When building the .NET product, there's no need to publish Windows PDBs. Any conversion to Windows PDBs will be done during staging, if necessary. -->
1212
<PublishWindowsPdb Condition="'$(DotNetBuild)' == 'true'">false</PublishWindowsPdb>

UseLocalCompiler.Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<FscToolPath Condition="'$(FscToolPath)' == ''">$([System.IO.Path]::GetDirectoryName($(DOTNET_HOST_PATH)))</FscToolPath>
1212
<FscToolExe Condition="'$(FscToolExe)' == ''">$([System.IO.Path]::GetFileName($(DOTNET_HOST_PATH)))</FscToolExe>
1313

14-
<DotnetFscCompilerPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net9.0/fsc.dll</DotnetFscCompilerPath>
15-
<Fsc_DotNET_DotnetFscCompilerPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net9.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
14+
<DotnetFscCompilerPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net10.0/fsc.dll</DotnetFscCompilerPath>
15+
<Fsc_DotNET_DotnetFscCompilerPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net10.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
1616

1717
<FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
1818
<FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
1919
</PropertyGroup>
2020

2121
<PropertyGroup Condition="'$(LoadLocalFSharpBuild)' == 'True'">
22-
<LocalFSharpBuildBinPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net9.0</LocalFSharpBuildBinPath>
22+
<LocalFSharpBuildBinPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net10.0</LocalFSharpBuildBinPath>
2323
<FSharpBuildAssemblyFile>$(LocalFSharpBuildBinPath)/FSharp.Build.dll</FSharpBuildAssemblyFile>
2424
<FSharpTargetsPath>$(LocalFSharpBuildBinPath)/Microsoft.FSharp.Targets</FSharpTargetsPath>
2525
<FSharpPropsShim>$(LocalFSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>

buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>
99
<OutputPath>$(CachePath)\bin</OutputPath>

buildtools/checkpackages/FSharp.Core_notshipped.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
</PropertyGroup>
88

99
<PropertyGroup>

eng/Build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ param (
3535
# Options
3636
[switch][Alias('proto')]$bootstrap,
3737
[string]$bootstrapConfiguration = "Proto",
38-
[string]$bootstrapTfm = "net9.0",
39-
[string]$fsharpNetCoreProductTfm = "net9.0",
38+
[string]$bootstrapTfm = "net10.0",
39+
[string]$fsharpNetCoreProductTfm = "net10.0",
4040
[switch][Alias('bl')]$binaryLog = $true,
4141
[switch][Alias('nobl')]$excludeCIBinaryLog = $false,
4242
[switch][Alias('nolog')]$noBinaryLog = $false,
@@ -83,7 +83,7 @@ $BuildCategory = ""
8383
$BuildMessage = ""
8484

8585
$desktopTargetFramework = "net472"
86-
$coreclrTargetFramework = "net9.0"
86+
$coreclrTargetFramework = "net10.0"
8787

8888
function Print-Usage() {
8989
Write-Host "Common settings:"

eng/build-utils.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { $false }
1414
$bootstrapDir = if (Test-Path variable:bootstrapDir) { $bootstrapDir } else { "" }
1515
$bootstrapConfiguration = if (Test-Path variable:bootstrapConfiguration) { $bootstrapConfiguration } else { "Proto" }
1616
$bootstrapTfm = if (Test-Path variable:bootstrapTfm) { $bootstrapTfm } else { "net472" }
17-
$fsharpNetCoreProductTfm = if (Test-Path variable:fsharpNetCoreProductTfm) { $fsharpNetCoreProductTfm } else { "net9.0" }
17+
$fsharpNetCoreProductTfm = if (Test-Path variable:fsharpNetCoreProductTfm) { $fsharpNetCoreProductTfm } else { "net10.0" }
1818
$properties = if (Test-Path variable:properties) { $properties } else { @() }
1919

2020
function GetProjectOutputBinary([string]$fileName, [string]$projectName = "", [string]$configuration = $script:configuration, [string]$tfm = "net472", [string]$rid = "", [bool]$published = $false) {

eng/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ properties=""
8383
docker=false
8484
args=""
8585

86-
tfm="net9.0" # This needs to be changed every time it's bumped by arcade/us.
86+
tfm="net10.0" # This needs to be changed every time it's bumped by arcade/us.
8787

8888
BuildCategory=""
8989
BuildMessage=""

eng/test-determinism.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ try {
404404

405405
$script:bootstrap = $true
406406
$script:bootstrapConfiguration = "Proto"
407-
$script:fsharpNetCoreProductTfm = "net9.0"
407+
$script:fsharpNetCoreProductTfm = "net10.0"
408408
$script:bootstrapTfm = $script:fsharpNetCoreProductTfm
409409

410410
$bootstrapDir = Make-BootstrapBuild

src/Compiler/Driver/FxResolver.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ type internal FxResolver
412412

413413
match runningTfmOpt with
414414
| Some tfm -> tfm
415-
| _ -> if isRunningOnCoreClr then "net9.0" else "net472"
415+
| _ -> if isRunningOnCoreClr then "net10.0" else "net472"
416416

417417
let trySdkRefsPackDirectory =
418418
lazy

0 commit comments

Comments
 (0)