Skip to content

Commit c8a935f

Browse files
baronfelbaronfel
authored
Merge pull request #950 from baronfel/integrate-sourcelink
From dotnet/fsharp:079276b4b..37d0ccc. This is a small bugfix release that I'm making primarily to publish a version of FCS with sourcelink enabled, so that tooling users can make use of that information.
2 parents 3d47f01 + 19d9e06 commit c8a935f

Some content is hidden

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

41 files changed

+573
-227
lines changed

‎.github/workflows/build.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ jobs:
66
build:
77

88
strategy:
9+
fail-fast: false
910
matrix:
1011
os: [windows-latest, macos-latest, ubuntu-latest]
11-
dotnet: [3.1.201] # TODO: wish this action didn't pin versions...
12+
dotnet: [3.1.301] # TODO: wish this action didn't pin versions...
13+
include:
14+
- os: windows-latest
15+
knownFailure: false
16+
- os: macos-latest
17+
knownFailure: true
18+
- os: ubuntu-latest
19+
knownFailure: true
1220
runs-on: ${{ matrix.os }}
1321

1422
steps:
@@ -20,11 +28,16 @@ jobs:
2028
- name: Restore tools
2129
run: dotnet tool restore
2230
working-directory: ./fcs
23-
- name: Build and test
24-
run: dotnet fake build -t TestAndNuGet
31+
- name: Build
32+
run: dotnet fake build -t Build
2533
working-directory: ./fcs
34+
- name: Test
35+
run: dotnet fake build -s -t Test
36+
working-directory: ./fcs
37+
if: ${{ !matrix.knownFailure }}
2638
- name: Archive code coverage results
2739
uses: actions/upload-artifact@v2
40+
if: always()
2841
with:
29-
name: code-coverage-report
42+
name: code-coverage-report-${{ matrix.os }}-${{ env.GITHUB_SHA }}
3043
path: ${{ github.workspace }}/artifacts/TestResults/Release/FSharp.Compiler.Service.Test.*.xml

‎.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 3.1.201
18+
dotnet-version: 3.1.301
1919
- name: Restore tools
2020
run: dotnet tool restore
2121
working-directory: ./fcs

‎.github/workflows/publish.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [macos-latest]
14-
dotnet: [3.1.201]
14+
dotnet: [3.1.301]
1515
runs-on: ${{ matrix.os }}
1616

1717
steps:
@@ -23,21 +23,21 @@ jobs:
2323
- name: Restore tools
2424
run: dotnet tool restore
2525
working-directory: ./fcs
26-
- name: Build and Test
27-
run: dotnet fake build -t TestAndNuget
26+
- name: Build and package
27+
run: dotnet fake build -t NuGet
2828
working-directory: ./fcs
2929
- name: Validate package bump
3030
run: dotnet fake build -s -t ValidateVersionBump
3131
working-directory: ./fcs
32-
- name: Publish to nuget
33-
run: dotnet fake build -s -t PublishNuget
34-
working-directory: ./fcs
35-
env:
36-
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
3732
- name: Create release
3833
run: dotnet fake build -s -t CreateRelease
3934
working-directory: ./fcs
4035
env:
4136
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
- name: Publish to nuget
38+
run: dotnet fake build -s -t PublishNuget
39+
working-directory: ./fcs
40+
env:
41+
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
4242

4343

‎FSharpBuild.Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<!-- directory locations -->
1111
<PropertyGroup>
1212
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
13+
<FSharpTestsRoot>$(RepoRoot)tests</FSharpTestsRoot>
1314
<SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
1415
<ProtoOutputPath>$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
1516
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>

‎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.0\fsc.exe</DotnetFscCompilerPath>
25+
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp3.1\fsc.exe</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.0\fsi.exe</DotnetFsiCompilerPath>
30+
<DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp3.1\fsi.exe</DotnetFsiCompilerPath>
3131
</PropertyGroup>
3232

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

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

‎clean.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ DEAD_DIRS=(
1919
"TESTGUIDE.md"
2020
"tests/EndToEndBuildTests"
2121
"tests/FSharp.Build.UnitTests"
22+
"tests/FSharp.Compiler.ComponentTests"
2223
"tests/FSharp.Compiler.Private.Scripting.UnitTests"
2324
"tests/FSharp.Compiler.UnitTests"
2425
"tests/FSharp.Core.UnitTests"

‎eng/Build.ps1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ function Process-Arguments() {
152152

153153
function Update-Arguments() {
154154
if ($script:noVisualStudio) {
155-
$script:bootstrapTfm = "netcoreapp3.0"
155+
$script:bootstrapTfm = "netcoreapp3.1"
156156
$script:msbuildEngine = "dotnet"
157157
}
158158

159-
if ($bootstrapTfm -eq "netcoreapp3.0") {
159+
if ($bootstrapTfm -eq "netcoreapp3.1") {
160160
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
161161
$script:bootstrap = $True
162162
}
@@ -178,7 +178,7 @@ function BuildSolution() {
178178
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
179179
$toolsetBuildProj = InitializeToolset
180180
$quietRestore = !$ci
181-
$testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.0" } else { "" }
181+
$testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.1" } else { "" }
182182

183183
# Do not set the property to true explicitly, since that would override value projects might set.
184184
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
@@ -264,7 +264,7 @@ function TestUsingNUnit([string] $testProject, [string] $targetFramework) {
264264
}
265265

266266
function BuildCompiler() {
267-
if ($bootstrapTfm -eq "netcoreapp3.0") {
267+
if ($bootstrapTfm -eq "netcoreapp3.1") {
268268
$dotnetPath = InitializeDotNetCli
269269
$dotnetExe = Join-Path $dotnetPath "dotnet.exe"
270270
$fscProject = "$RepoRoot\src\fsharp\fsc\fsc.fsproj"
@@ -277,14 +277,14 @@ function BuildCompiler() {
277277
$logFilePath = Join-Path $LogDir "fscBootstrapLog.binlog"
278278
$args += " /bl:$logFilePath"
279279
}
280-
$args = "build $fscProject -c $configuration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental
280+
$args = "build $fscProject -c $configuration -v $verbosity -f netcoreapp3.1" + $argNoRestore + $argNoIncremental
281281
Exec-Console $dotnetExe $args
282282

283283
if ($binaryLog) {
284284
$logFilePath = Join-Path $LogDir "fsiBootstrapLog.binlog"
285285
$args += " /bl:$logFilePath"
286286
}
287-
$args = "build $fsiProject -c $configuration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental
287+
$args = "build $fsiProject -c $configuration -v $verbosity -f netcoreapp3.1" + $argNoRestore + $argNoIncremental
288288
Exec-Console $dotnetExe $args
289289
}
290290
}
@@ -448,9 +448,10 @@ try {
448448
$script:BuildCategory = "Test"
449449
$script:BuildMessage = "Failure running tests"
450450
$desktopTargetFramework = "net472"
451-
$coreclrTargetFramework = "netcoreapp3.0"
451+
$coreclrTargetFramework = "netcoreapp3.1"
452452

453453
if ($testDesktop -and -not $noVisualStudio) {
454+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $desktopTargetFramework
454455
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
455456
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $desktopTargetFramework
456457
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $desktopTargetFramework
@@ -459,6 +460,7 @@ try {
459460
}
460461

461462
if ($testCoreClr) {
463+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $coreclrTargetFramework
462464
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
463465
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
464466
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $coreclrTargetFramework

‎eng/Versions.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<MicrosoftNetCompilersVersion>2.7.0</MicrosoftNetCompilersVersion>
177177
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILDAsmVersion>
178178
<MicrosoftNETCoreILAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILAsmVersion>
179-
<MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
179+
<MicrosoftNETTestSdkVersion>16.6.1</MicrosoftNETTestSdkVersion>
180180
<MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>
181181
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
182182
<NUnitVersion>3.11.0</NUnitVersion>
@@ -186,5 +186,7 @@
186186
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
187187
<StrawberryPerlVersion>5.28.0.1</StrawberryPerlVersion>
188188
<StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
189+
<XUnitVersion>2.4.1</XUnitVersion>
190+
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
189191
</PropertyGroup>
190192
</Project>

‎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.0" + $argNoRestore + $argNoIncremental
247+
$args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity -f netcoreapp3.1" + $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.0" -Destination "$dir\fslex" -Force -Recurse
255-
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\fsyacc" -Force -Recurse
256-
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\AssemblyCheck" -Force -Recurse
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
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
@@ -244,8 +244,8 @@ function BuildSolution {
244244
/t:Publish
245245

246246
mkdir -p "$bootstrap_dir"
247-
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.0/publish $bootstrap_dir/fslex
248-
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.0/publish $bootstrap_dir/fsyacc
247+
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fslex
248+
cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fsyacc
249249
fi
250250
if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
251251
BuildMessage="Error building bootstrap"
@@ -254,7 +254,7 @@ function BuildSolution {
254254
/p:Configuration=$bootstrap_config \
255255
/t:Publish
256256

257-
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.0/publish $bootstrap_dir/fsc
257+
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fsc
258258
fi
259259

260260
# do real build
@@ -293,7 +293,7 @@ InitializeDotNetCli $restore
293293
BuildSolution
294294

295295
if [[ "$test_core_clr" == true ]]; then
296-
coreclrtestframework=netcoreapp3.0
296+
coreclrtestframework=netcoreapp3.1
297297
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
298298
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
299299
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\netfx.props" />
33
<Import Project="..\..\eng\Versions.props"/> <!-- keep our test deps in line with the overall compiler -->
44
<PropertyGroup>
5-
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.1</TargetFrameworks>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<DefaultFSharpPackageVersion>4.1.19</DefaultFSharpPackageVersion>
88
<NoWarn>$(NoWarn);44;75;</NoWarn>
@@ -73,7 +73,7 @@
7373
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\ScriptOptionsTests.fs">
7474
<Link>ScriptOptionsTests.fs</Link>
7575
</Compile>
76-
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
76+
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
7777
<Link>Program.fs</Link>
7878
</Compile>
7979
<NoneSubstituteText Include="App.config">

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
</PropertyGroup>
66
<Import Project="..\netfx.props" />
77
<Import Project="..\..\src\buildtools\buildtools.targets" />
8+
<Import Project="..\..\eng\Versions.props" />
89
<PropertyGroup>
910
<TargetFrameworks>$(FcsTargetNetFxFramework);netstandard2.0</TargetFrameworks>
1011
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -33,6 +34,8 @@
3334
<PackageProjectUrl>https://github.com/fsharp/FSharp.Compiler.Service</PackageProjectUrl>
3435
<PackageIcon>logo.png</PackageIcon>
3536
<PackageTags>F#, fsharp, interactive, compiler, editor</PackageTags>
37+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
38+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3639
</PropertyGroup>
3740
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3841
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
@@ -726,6 +729,7 @@
726729
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
727730
<PackageReference Include="System.Buffers" Version="4.5.0" />
728731
<PackageReference Include="System.Memory" Version="4.5.3" />
732+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
729733
</ItemGroup>
730734
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
731735
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />

‎fcs/RELEASE_NOTES.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
#### 36.0.2
2+
3+
This is a small bugfix release that I'm making primarily to publish a version
4+
of FCS with sourcelink enabled, so that tooling users can make use of that information.
5+
6+
From dotnet/fsharp:079276b4b..37d0cccec:
7+
8+
* Fixes for `do!` handling in computation expressions (thanks @baronfel)
9+
* Add missing versions in FCS' Interactive header (thanks @nightroman)
10+
* Support `Source`-translation in `match!` expressions (thanks @baronfel)
11+
* Ensure stack traces from uncaught exceptions in CEs are maintained (thanks @NinoFloris)
12+
* Better handling of `inline` in witness-passing codepaths (thanks @dsyme)
13+
* Enable publishing of FCS with sourcelink (thanks @baronfel)
14+
* Extend `nameof` to support naming generic parameters (`nameof<'t>`) and instance members (`nameof(Unchecked.defaultof<C>.Property)`) (thanks @dsyme)
15+
116
#### 36.0.1
217

318
From dotnet/fsharp:522dd906c..16bca5aef:

‎fcs/build.fsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Target.create "Restore" (fun _ ->
5959

6060
Target.create "Build" (fun _ ->
6161
runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto"
62-
let fslexPath = Path.GetFullPath <| Path.Combine(__SOURCE_DIRECTORY__, "../artifacts/bin/fslex/Proto/netcoreapp3.1/fslex.dll")
63-
let fsyaccPath = Path.GetFullPath <| Path.Combine(__SOURCE_DIRECTORY__, "../artifacts/bin/fsyacc/Proto/netcoreapp3.1/fsyacc.dll")
62+
let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp3.1/fslex.dll"
63+
let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp3.1/fsyacc.dll"
6464
runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
6565
)
6666

‎fcs/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "3.1.200",
3+
"version": "3.1.301",
44
"rollForward":"minor"
55
}
66
}

‎fcs/paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ source https://api.nuget.org/v3/index.json
3636
framework: netstandard2.0
3737

3838
storage: packages
39-
nuget FSharp.Compiler.Service 35.0.0
39+
nuget FSharp.Compiler.Service 36.0.1

‎fcs/paket.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ STORAGE: PACKAGES
716716
RESTRICTION: == netstandard2.0
717717
NUGET
718718
remote: https://api.nuget.org/v3/index.json
719-
FSharp.Compiler.Service (35.0)
719+
FSharp.Compiler.Service (36.0.1)
720720
FSharp.Core (>= 4.6.2)
721721
System.Buffers (>= 4.5)
722722
System.Collections.Immutable (>= 1.5)

‎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.0</TargetFrameworks>
4+
<TargetFrameworks>$(FcsTargetNetFxFramework);netcoreapp3.1</TargetFrameworks>
55
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
66
<OutputType>Exe</OutputType>
77
<IsPackable>false</IsPackable>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.200",
3+
"dotnet": "3.1.301",
44
"vs": {
55
"version": "16.4",
66
"components": [

‎proto.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
<ItemGroup>
99
<Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj">
10-
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.0</AdditionalProperties>
10+
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
1111
</Projects>
1212
<Projects Include="src\fsharp\fsc\fsc.fsproj">
13-
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.0</AdditionalProperties>
13+
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
1414
</Projects>
1515
<Projects Include="src\fsharp\fsi\fsi.fsproj">
16-
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.0</AdditionalProperties>
16+
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp3.1</AdditionalProperties>
1717
</Projects>
1818
</ItemGroup>
1919

0 commit comments

Comments
 (0)