Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to FCS 40 #682

Merged
merged 3 commits into from
Jul 22, 2021
Merged

Bump to FCS 40 #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
972f756
initial work to bump to FCS 40
baronfel Jun 24, 2021
61645a3
build/publish on net5 only
baronfel Jun 29, 2021
374a3ab
Fix a few references to netcoreapp3.1, as well as warnings
baronfel Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.20.3",
"version": "5.20.4",
"commands": [
"fake"
]
},
"paket": {
"version": "5.249.0",
"version": "6.0.0-rc002",
"commands": [
"paket"
]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
dotnet: [3.1.302, 5.0.100]
dotnet: [5.0.100]
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
dotnet: [3.1.302]
dotnet: [5.0.100]
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 0 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OtherFlags>/warnon:1182</OtherFlags>
<!-- we still can generate docs on netcoreapp3.1 -->
<OtherFlags>/langversion:4.7</OtherFlags>
</PropertyGroup>

<!-- NuGet Metadata -->
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ See https://fsprojects.github.io/FSharp.Formatting/
One built you can run the command-line tool to self-build the docs for this directory using

dotnet build
src\FSharp.Formatting.CommandTool\bin\Debug\netcoreapp3.1\fsdocs.exe watch
src\FSharp.Formatting.CommandTool\bin\Debug\netcoreapp3.1\fsdocs.exe build --clean
src\FSharp.Formatting.CommandTool\bin\Debug\net5.0\fsdocs.exe watch
src\FSharp.Formatting.CommandTool\bin\Debug\net5.0\fsdocs.exe build --clean


## Maintainer(s)
Expand Down
2 changes: 1 addition & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Target.create "Tests" (fun _ ->
{ opts with
Blame = true
NoBuild = true
Framework = if Environment.isWindows then opts.Framework else Some "netcoreapp3.1"
Framework = Some "net5.0"
Configuration = configuration
ResultsDirectory = Some "TestResults"
Logger = Some "trx"
Expand Down
2 changes: 1 addition & 1 deletion paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ framework: auto-detect
storage: none

nuget FSharp.Core >= 4.7 lowest_matching:true
nuget FSharp.Compiler.Service 39.0.0
nuget FSharp.Compiler.Service 40.0.0
nuget CommandLineParser ~> 2.8
nuget Microsoft.Build.Framework
nuget Microsoft.Build.Tasks.Core
Expand Down
491 changes: 155 additions & 336 deletions paket.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/FSharp.Formatting.ApiDocs/GenerateHtml.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ open System.Collections.Generic
open System.IO
open System.Web
open FSharp.Formatting.Common
open FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.Symbols
open FSharp.Formatting.Templating
open FSharp.Formatting.HtmlModel
open FSharp.Formatting.HtmlModel.Html
Expand Down
Loading