Skip to content

Commit 0ae9b03

Browse files
KevinRansomKevinRansom
authored
Merge branch 'release/dev17.8' into merges/main-to-release/dev17.8
2 parents 440a519 + 2f4b862 commit 0ae9b03

File tree

73 files changed

+182
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+182
-159
lines changed

‎.vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// TODO: Shall we assume that it's already been built, or build it every time we debug?
2424
// "preLaunchTask": "Build (Debug)",
2525
// If you have changed target frameworks, make sure to update the program p
26-
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net7.0/fsi.dll",
26+
"program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net8.0/fsi.dll",
2727
"args": [
2828
"${input:fsiArgsPrompt}"
2929
],
@@ -52,7 +52,7 @@
5252
// TODO: Shall we assume that it's already been built, or build it every time we debug?
5353
// "preLaunchTask": "Build (Debug)",
5454
// If you have changed target frameworks, make sure to update the program path.
55-
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net7.0/fsc.dll",
55+
"program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net8.0/fsc.dll",
5656
"args": [
5757
"${input:fscArgsPrompt}"
5858
],

‎DEVGUIDE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ To use your custom build of `Fsc`, add the `DotnetFscCompilerPath` property to y
130130

131131
```xml
132132
<PropertyGroup>
133-
<DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net7.0\fsc.dll</DotnetFscCompilerPath>
133+
<DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net8.0\fsc.dll</DotnetFscCompilerPath>
134134
</PropertyGroup>
135135
```
136136

‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts/</ArtifactsDir>
3030
<OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
3131
<IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
32-
<FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net7.0/fslex.dll</FsLexPath>
33-
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net7.0/fsyacc.dll</FsYaccPath>
32+
<FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net8.0/fslex.dll</FsLexPath>
33+
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net8.0/fsyacc.dll</FsYaccPath>
3434
</PropertyGroup>
3535

3636
<Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'"/>

‎FSharpTests.Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
<FscToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FscToolPath>
2323
<FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
2424
<FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
25-
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net7.0\fsc.dll</DotnetFscCompilerPath>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net8.0\fsc.dll</DotnetFscCompilerPath>
2626

2727
<FsiToolPath>$([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)'))</FsiToolPath>
2828
<FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
2929
<FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
30-
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net7.0\fsi.dll</DotnetFsiCompilerPath>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net8.0\fsi.dll</DotnetFsiCompilerPath>
3131
</PropertyGroup>
3232

3333
<!-- SDK targets override -->
3434
<PropertyGroup>
3535
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework>
36-
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net7.0</_FSharpBuildTargetFramework>
36+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net8.0</_FSharpBuildTargetFramework>
3737
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
3838

3939
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>

‎azure-pipelines.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ stages:
8686
# Signed build #
8787
#-------------------------------------------------------------------------------------------------------------------#
8888
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
89-
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.7') }}:
89+
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.8') }}:
9090
- template: /eng/common/templates/job/onelocbuild.yml
9191
parameters:
9292
MirrorRepo: fsharp
93-
MirrorBranch: release/dev17.7
93+
MirrorBranch: release/dev17.8
9494
LclSource: lclFilesfromPackage
9595
LclPackageId: 'LCL-JUNO-PROD-FSHARP'
9696
- template: /eng/common/templates/jobs/jobs.yml
@@ -371,7 +371,7 @@ stages:
371371
displayName: Build / Integration Test
372372
continueOnError: true
373373
condition: eq(variables['_testKind'], 'testIntegration')
374-
374+
375375
- task: PublishTestResults@2
376376
displayName: Publish Test Results
377377
inputs:
@@ -709,8 +709,8 @@ stages:
709709
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
710710
- template: eng/release/insert-into-vs.yml
711711
parameters:
712-
componentBranchName: refs/heads/release/dev17.7
713-
insertTargetBranch: rel/d17.7
712+
componentBranchName: refs/heads/release/dev17.8
713+
insertTargetBranch: main
714714
insertTeamEmail: fsharpteam@microsoft.com
715715
insertTeamName: 'F#'
716716
completeInsertion: 'auto'

‎buildtools/AssemblyCheck/AssemblyCheck.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
88
</PropertyGroup>

‎buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj

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

55
<PropertyGroup>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>net8.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

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

55
<PropertyGroup>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>ne87.0</TargetFramework>
77
</PropertyGroup>
88

99
<PropertyGroup>

‎buildtools/fslex/fslex.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
88
</PropertyGroup>

‎buildtools/fsyacc/fsyacc.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
88
</PropertyGroup>

‎eng/Build.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,11 @@ function Process-Arguments() {
222222

223223
function Update-Arguments() {
224224
if ($script:noVisualStudio) {
225-
$script:bootstrapTfm = "net7.0"
225+
$script:bootstrapTfm = "net8.0"
226226
$script:msbuildEngine = "dotnet"
227227
}
228228

229-
if ($bootstrapTfm -eq "net7.0") {
229+
if ($bootstrapTfm -eq "net8.0") {
230230
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
231231
$script:bootstrap = $True
232232
}
@@ -248,7 +248,7 @@ function BuildSolution([string] $solutionName, $nopack) {
248248
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
249249
$toolsetBuildProj = InitializeToolset
250250
$quietRestore = !$ci
251-
$testTargetFrameworks = if ($testCoreClr) { "net7.0" } else { "" }
251+
$testTargetFrameworks = if ($testCoreClr) { "net8.0" } else { "" }
252252

253253
# Do not set the property to true explicitly, since that would override value projects might set.
254254
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
@@ -559,7 +559,7 @@ try {
559559
$script:BuildCategory = "Test"
560560
$script:BuildMessage = "Failure running tests"
561561
$desktopTargetFramework = "net472"
562-
$coreclrTargetFramework = "net7.0"
562+
$coreclrTargetFramework = "net8.0"
563563

564564
if ($testCoreClr) {
565565
$bgJob = TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $coreclrTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharpSuite.Tests\" -asBackgroundJob $true

‎eng/DumpPackageRoot/DumpPackageRoot.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Used as a diagnostic tool to view the state of the NuGet package cache as it existed immediately after a restore/build. -->
44

55
<PropertyGroup>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎eng/SourceBuildPrebuiltBaseline.xml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.8" />
1515
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.8" />
1616
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.8" />
17+
1718
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
1819
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
1920
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />

‎eng/Version.Details.xml

+22-2
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,35 @@
3434
</Dependency>
3535
</ProductDependencies>
3636
<ToolsetDependencies>
37-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23320.3">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23322.2">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
39+
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
4040
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4141
</Dependency>
4242
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23314.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
4343
<Uri>https://github.com/dotnet/sourcelink</Uri>
4444
<Sha>4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88</Sha>
4545
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
4646
</Dependency>
47+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
48+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
49+
<Sha>068998a5d91f55a619d1d072ab3094dacd5d6a4f</Sha>
50+
</Dependency>
51+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
52+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
53+
<Sha>068998a5d91f55a619d1d072ab3094dacd5d6a4f</Sha>
54+
</Dependency>
55+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
56+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
57+
<Sha>068998a5d91f55a619d1d072ab3094dacd5d6a4f</Sha>
58+
</Dependency>
59+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
60+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
61+
<Sha>068998a5d91f55a619d1d072ab3094dacd5d6a4f</Sha>
62+
</Dependency>
63+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
64+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
65+
<Sha>068998a5d91f55a619d1d072ab3094dacd5d6a4f</Sha>
66+
</Dependency>
4767
</ToolsetDependencies>
4868
</Dependencies>

‎eng/Versions.props

+11-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<PropertyGroup>
1414
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
1515
<!-- F# Version components -->
16-
<FSMajorVersion>7</FSMajorVersion>
16+
<FSMajorVersion>8</FSMajorVersion>
1717
<FSMinorVersion>0</FSMinorVersion>
18-
<FSBuildVersion>400</FSBuildVersion>
18+
<FSBuildVersion>100</FSBuildVersion>
1919
<FSRevisionVersion>0</FSRevisionVersion>
2020
<!-- -->
2121
<!-- F# Language version -->
@@ -32,7 +32,7 @@
3232
<!-- -->
3333
<!-- FSharp.Compiler.Service version -->
3434
<FCSMajorVersion>43</FCSMajorVersion>
35-
<FCSMinorVersion>7</FCSMinorVersion>
35+
<FCSMinorVersion>8</FCSMinorVersion>
3636
<FCSBuildVersion>$(FSBuildVersion)</FCSBuildVersion>
3737
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
3838
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
@@ -47,7 +47,7 @@
4747
<!-- -->
4848
<!-- FSharp tools for Visual Studio version number -->
4949
<FSToolsMajorVersion>12</FSToolsMajorVersion>
50-
<FSToolsMinorVersion>7</FSToolsMinorVersion>
50+
<FSToolsMinorVersion>8</FSToolsMinorVersion>
5151
<FSToolsBuildVersion>0</FSToolsBuildVersion>
5252
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
5353
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
@@ -56,7 +56,7 @@
5656
</PropertyGroup>
5757
<PropertyGroup>
5858
<VSMajorVersion>17</VSMajorVersion>
59-
<VSMinorVersion>7</VSMinorVersion>
59+
<VSMinorVersion>8</VSMinorVersion>
6060
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6161
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6262
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -205,5 +205,11 @@
205205
<XUnitRunnerVersion>2.4.2</XUnitRunnerVersion>
206206
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
207207
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
208+
<!-- MIBC profile packages -->
209+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23362.5</optimizationwindows_ntx64MIBCRuntimeVersion>
210+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23362.5</optimizationwindows_ntx86MIBCRuntimeVersion>
211+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23362.5</optimizationwindows_ntarm64MIBCRuntimeVersion>
212+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23362.5</optimizationlinuxx64MIBCRuntimeVersion>
213+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23362.5</optimizationlinuxarm64MIBCRuntimeVersion>
208214
</PropertyGroup>
209215
</Project>

‎eng/build-utils.ps1

+3-6
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ function Make-BootstrapBuild() {
251251
}
252252
Exec-Console $dotnetExe $args
253253

254-
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\net7.0" -Destination "$dir\fslex" -Force -Recurse
255-
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\net7.0" -Destination "$dir\fsyacc" -Force -Recurse
256-
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\net7.0" -Destination "$dir\AssemblyCheck" -Force -Recurse
254+
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\net8.0" -Destination "$dir\fslex" -Force -Recurse
255+
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\net8.0" -Destination "$dir\fsyacc" -Force -Recurse
256+
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\net8.0" -Destination "$dir\AssemblyCheck" -Force -Recurse
257257

258258
# prepare compiler
259259
$protoProject = "`"$RepoRoot\proto.sln`""
@@ -269,6 +269,3 @@ function Make-BootstrapBuild() {
269269

270270
return $dir
271271
}
272-
273-
274-

‎eng/build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ function BuildSolution {
264264
MSBuild "$repo_root/buildtools/buildtools.proj" /restore "$bltools" /p:Configuration=$bootstrap_config
265265

266266
mkdir -p "$bootstrap_dir"
267-
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net7.0 $bootstrap_dir/fslex
268-
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net7.0 $bootstrap_dir/fsyacc
267+
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net8.0 $bootstrap_dir/fslex
268+
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net8.0 $bootstrap_dir/fsyacc
269269
fi
270270
if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
271271
local bltools=""
@@ -274,7 +274,7 @@ function BuildSolution {
274274
fi
275275
BuildMessage="Error building bootstrap"
276276
MSBuild "$repo_root/Proto.sln" /restore "$bltools" /p:Configuration=$bootstrap_config
277-
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net7.0 $bootstrap_dir/fsc
277+
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net8.0 $bootstrap_dir/fsc
278278
fi
279279
fi
280280

@@ -316,7 +316,7 @@ InitializeDotNetCli $restore
316316
BuildSolution
317317

318318
if [[ "$test_core_clr" == true ]]; then
319-
coreclrtestframework=net7.0
319+
coreclrtestframework=net8.0
320320
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
321321
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework --notestfilter
322322
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
@@ -326,7 +326,7 @@ if [[ "$test_core_clr" == true ]]; then
326326
fi
327327

328328
if [[ "$test_compilercomponent_tests" == true ]]; then
329-
coreclrtestframework=net7.0
329+
coreclrtestframework=net8.0
330330
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
331331
fi
332332

‎eng/test-determinism.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ try {
380380
$script:bootstrapTfm = "net472"
381381

382382
if ($script:msbuildEngine -eq "dotnet") {
383-
$script.bootstrapTfm = "net7.0"
383+
$script.bootstrapTfm = "net8.0"
384384
}
385385

386386
$bootstrapDir = Make-BootstrapBuild

‎fcs-samples/EditorService/EditorService.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\netfx.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>$(FcsTargetNetFxFramework);net7.0</TargetFrameworks>
4+
<TargetFrameworks>$(FcsTargetNetFxFramework);net8.0</TargetFrameworks>
55
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
66
<OutputType>Exe</OutputType>
77
<IsPackable>false</IsPackable>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"perl": "5.32.1.1"
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3",
19+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2",
2020
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2121
}
2222
}

‎src/Compiler/Driver/FxResolver.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ type internal FxResolver
416416

417417
match runningTfmOpt with
418418
| Some tfm -> tfm
419-
| _ -> if isRunningOnCoreClr then "net7.0" else "net472"
419+
| _ -> if isRunningOnCoreClr then "net8.0" else "net472"
420420

421421
let trySdkRefsPackDirectory =
422422
lazy

‎src/Compiler/FSharp.Compiler.Service.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -521,15 +521,15 @@
521521
<ItemGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
522522
<!-- We are setting TFM explicitly here, since we are only using fslexyacc's dlls in msbuild -->
523523
<ProjectReference Include="$(RepoRoot)\buildtools\fslex\fslex.fsproj" ReferenceOutputAssembly="False">
524-
<SetTargetFramework>TargetFramework=net7.0</SetTargetFramework>
524+
<SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
525525
<ExcludeAssets>compile</ExcludeAssets>
526526
</ProjectReference>
527527
<ProjectReference Include="$(RepoRoot)\buildtools\fsyacc\fsyacc.fsproj" ReferenceOutputAssembly="False">
528-
<SetTargetFramework>TargetFramework=net7.0</SetTargetFramework>
528+
<SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
529529
<ExcludeAssets>compile</ExcludeAssets>
530530
</ProjectReference>
531531
<ProjectReference Include="$(RepoRoot)\buildtools\AssemblyCheck\AssemblyCheck.fsproj" ReferenceOutputAssembly="False">
532-
<SetTargetFramework>TargetFramework=net7.0</SetTargetFramework>
532+
<SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
533533
<ExcludeAssets>compile</ExcludeAssets>
534534
</ProjectReference>
535535
</ItemGroup>

‎src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<PreRelease>true</PreRelease>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
88
<IsPackable>true</IsPackable>
99
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>

0 commit comments

Comments
 (0)