Skip to content

Retarget everything to .NET 6 #606

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

Closed
Numpsy wants to merge 2 commits into from
Closed

Retarget everything to .NET 6 #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2209335
Build with the .NET 6 SDK
Numpsy Nov 1, 2023
2fb7cb4
Build everything as .NET 6
Numpsy Nov 1, 2023
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.4",
"version": "6.0.0",
"commands": [
"fake"
]
},
"paket": {
"version": "5.252.0",
"version": "7.2.1",
"commands": [
"paket"
]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build+test+publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- '**'

env:
DOTNET_VERSION: 5.0.202
DOTNET_VERSION: 6.0.416

jobs:
buildAndTest:
Expand All @@ -20,6 +20,7 @@ jobs:
- ubuntu-latest
- windows-latest
- macOS-latest

runs-on: ${{ matrix.os }}

steps:
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 @@ -171,7 +171,7 @@ Target.create "Push" (fun _ ->


Target.create "SelfCheck" (fun _ ->
let frameworkVersion = "net5.0"
let frameworkVersion = "net6.0"
let srcDir = Path.Combine(rootDir.FullName, "src") |> DirectoryInfo

let consoleProj = Path.Combine(srcDir.FullName, "FSharpLint.Console", "FSharpLint.Console.fsproj") |> FileInfo
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.202"
,"rollForward": "minor"
"version": "6.0.416",
"rollForward": "minor"
}
}
5 changes: 3 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source https://api.nuget.org/v3/index.json

framework: netstandard2.0, net5.0
framework: netstandard2.0, net6.0
storage: none

nuget Argu
Expand Down Expand Up @@ -39,8 +39,9 @@ group Docs
group Build
source https://api.nuget.org/v3/index.json

framework: netstandard2.0
framework: net6.0
storage: none
strategy: min

nuget Fake.Core.Target
nuget Fake.Core.Process
Expand Down
581 changes: 325 additions & 256 deletions paket.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/FSharpLint.Console/FSharpLint.Console.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>

<Title>FSharpLint.Console</Title>
<Description>Console application to run FSharpLint.</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/FSharpLint.Core/FSharpLint.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharpLint.Benchmarks/FSharpLint.Benchmarks.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Benchmark.fs" />
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharpLint.Console.Tests/FSharpLint.Console.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>FSharpLint.Console.Tests</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/FSharpLint.Core.Tests/FSharpLint.Core.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>FSharpLint.Core.Tests</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/FSharpLint.FunctionalTest/FSharpLint.FunctionalTest.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>FSharpLint.FunctionalTest</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/FSharpLint.FunctionalTest/TestConsoleApplication.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module Tests =
"Release"
#endif

let dll = basePath </> "src" </> "FSharpLint.Console" </> "bin" </> binDir </> "net5.0" </> "dotnet-fsharplint.dll"
let dll = basePath </> "src" </> "FSharpLint.Console" </> "bin" </> binDir </> "net6.0" </> "dotnet-fsharplint.dll"

let startInfo = ProcessStartInfo
(FileName = "dotnet",
Expand Down