Skip to content

Commit 46b0241

Browse files
KevinRansomKevinRansom
committed
Update build to fsharp5.0
1 parent 341121b commit 46b0241

File tree

39 files changed

+116
-116
lines changed

39 files changed

+116
-116
lines changed

‎FSharpTests.Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
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)\netcoreapp3.1\fsc.dll</DotnetFscCompilerPath>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net5.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)\netcoreapp3.1\fsi.dll</DotnetFsiCompilerPath>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net5.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'">netcoreapp3.1</_FSharpBuildTargetFramework>
36+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">net5.0</_FSharpBuildTargetFramework>
3737
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
3838

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

‎docs/fsharp-core-notes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ For modern templates, this is the default. For older templates, you may need to
5252
FSharp.Core.dll will normally appear in the `bin` output folder for your application. For example:
5353

5454
```
55-
Directory of ...\ConsoleApplication3\bin\Debug\netcoreapp3.1
55+
Directory of ...\ConsoleApplication3\bin\Debug\net5.0
5656
5757
18/04/2020 13:20 5,632 ConsoleApplication3.exe
5858
14/10/2020 12:12 1,400,472 FSharp.Core.dll

‎eng/Build.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@ function Process-Arguments() {
177177

178178
function Update-Arguments() {
179179
if ($script:noVisualStudio) {
180-
$script:bootstrapTfm = "netcoreapp3.1"
180+
$script:bootstrapTfm = "net5.0"
181181
$script:msbuildEngine = "dotnet"
182182
}
183183

184-
if ($bootstrapTfm -eq "netcoreapp3.1") {
184+
if ($bootstrapTfm -eq "net5.0") {
185185
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
186186
$script:bootstrap = $True
187187
}
@@ -201,7 +201,7 @@ function BuildSolution([string] $solutionName) {
201201
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
202202
$toolsetBuildProj = InitializeToolset
203203
$quietRestore = !$ci
204-
$testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.1" } else { "" }
204+
$testTargetFrameworks = if ($testCoreClr) { "net5.0" } else { "" }
205205

206206
# Do not set the property to true explicitly, since that would override value projects might set.
207207
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
@@ -458,7 +458,7 @@ try {
458458
$script:BuildCategory = "Test"
459459
$script:BuildMessage = "Failure running tests"
460460
$desktopTargetFramework = "net472"
461-
$coreclrTargetFramework = "netcoreapp3.1"
461+
$coreclrTargetFramework = "net5.0"
462462

463463
if ($testDesktop) {
464464
TestUsingXUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\FSharp.Compiler.ComponentTests\" -noTestFilter $true

‎eng/DumpPackageRoot/DumpPackageRoot.csproj‎

Lines changed: 1 addition & 1 deletion
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>netcoreapp3.1</TargetFramework>
6+
<TargetFramework>net5.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎eng/build-utils.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,16 @@ function Make-BootstrapBuild() {
244244
$argNoRestore = if ($norestore) { " --no-restore" } else { "" }
245245
$argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" }
246246

247-
$args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity -f netcoreapp3.1" + $argNoRestore + $argNoIncremental
247+
$args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity" + $argNoRestore + $argNoIncremental
248248
if ($binaryLog) {
249249
$logFilePath = Join-Path $LogDir "toolsBootstrapLog.binlog"
250250
$args += " /bl:$logFilePath"
251251
}
252252
Exec-Console $dotnetExe $args
253253

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

258258
# prepare compiler
259259
$protoProject = "`"$RepoRoot\proto.proj`""

‎eng/build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ function BuildSolution {
247247
/p:Configuration=$bootstrap_config
248248

249249
mkdir -p "$bootstrap_dir"
250-
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fslex
251-
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fsyacc
250+
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex
251+
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc
252252
fi
253253
if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
254254
BuildMessage="Error building bootstrap"
@@ -257,7 +257,7 @@ function BuildSolution {
257257
/p:Configuration=$bootstrap_config \
258258

259259

260-
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fsc
260+
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc
261261
fi
262262

263263
# do real build
@@ -297,7 +297,7 @@ InitializeDotNetCli $restore
297297
BuildSolution
298298

299299
if [[ "$test_core_clr" == true ]]; then
300-
coreclrtestframework=netcoreapp3.1
300+
coreclrtestframework=net5.0
301301
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
302302
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework --notestfilter
303303
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework

‎fcs-samples/EditorService/EditorService.fsproj‎

Lines changed: 1 addition & 1 deletion
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);netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>$(FcsTargetNetFxFramework);net5.0</TargetFrameworks>
55
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
66
<OutputType>Exe</OutputType>
77
<IsPackable>false</IsPackable>

‎proto.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
1111
</Projects>
1212
<Projects Include="src\fsharp\fsc\fsc.fsproj">
13-
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
13+
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=net5.0</AdditionalProperties>
1414
</Projects>
1515
<Projects Include="src\fsharp\fsi\fsi.fsproj">
16-
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
16+
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=net5.0</AdditionalProperties>
1717
</Projects>
1818
</ItemGroup>
1919

‎src/buildtools/AssemblyCheck/AssemblyCheck.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
</PropertyGroup>
88

‎src/buildtools/fslex/fslex.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
</PropertyGroup>

0 commit comments

Comments
 (0)