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

Drop support for net6 and net7 #367

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Drop support for net6 and net7 #367

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
93c3c71
Drop dependencies on net6 and net7
Tarmil Dec 13, 2024
a731a22
Drop net6 and net7 from paket.template
Tarmil Dec 13, 2024
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.0",
"version": "9.0.2",
"commands": [
"paket"
]
Expand Down
68 changes: 21 additions & 47 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,26 @@
source https://api.nuget.org/v3/index.json
storage: none
framework: netstandard2.0, net6.0, net7.0
framework: netstandard2.0, net8.0
lowest_matching: true
strategy: min

nuget FSharp.Core >= 6.0 content: none
nuget FSharp.Core >= 8.0 content: none
nuget FSharp.SystemTextJson >= 0.19.13
nuget HtmlAgilityPack >= 1.11.39
nuget Elmish >= 4.0.1 < 5.0
nuget Microsoft.AspNetCore.Components.Authorization >= 6.0.25
nuget Microsoft.AspNetCore.Components.WebAssembly.Authentication >= 6.0.25
nuget Microsoft.Extensions.Configuration.Binder >= 6.0
nuget Microsoft.Extensions.Http >= 6.0
nuget Microsoft.AspNetCore.Components >= 6.0.25
nuget Microsoft.AspNetCore.Components.Web >= 6.0.25
nuget Microsoft.AspNetCore.Components.WebAssembly >= 6.0.25
nuget Microsoft.AspNetCore.Components.WebAssembly.Server >= 6.0.25
nuget System.Text.Json >= 6.0
nuget Nerdbank.GitVersioning copy_local: true, lowest_matching: false
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs

group net8
source https://api.nuget.org/v3/index.json
storage: none
framework: net8.0
lowest_matching: true
strategy: min

nuget FSharp.Core >= 6.0 content: none
nuget Elmish >= 4.0.1 < 5.0
nuget Microsoft.AspNetCore.Components.WebAssembly >= 8.0.0
nuget Microsoft.AspNetCore.Components.Authorization >= 8.0.0
nuget Microsoft.AspNetCore.Components.WebAssembly.Authentication >= 8.0.0
nuget Microsoft.Extensions.Configuration.Binder >= 8.0.0
nuget Microsoft.Extensions.Http >= 8.0.0
nuget Microsoft.JSInterop.WebAssembly >= 8.0.0
nuget Microsoft.AspNetCore.Components >= 8.0.0
nuget Microsoft.AspNetCore.Components.Web >= 8.0.0
nuget Microsoft.Extensions.Http >= 8.0.0
nuget FSharp.SystemTextJson >= 0.19.13
nuget System.Text.Json >= 8.0.0
nuget Microsoft.AspNetCore.Components.WebAssembly >= 8.0.0
nuget Microsoft.AspNetCore.Components.WebAssembly.Server >= 8.0.0
nuget System.Text.Json >= 8.0.5
nuget Nerdbank.GitVersioning copy_local: true, lowest_matching: false
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs

group build
source https://api.nuget.org/v3/index.json
Expand All @@ -61,7 +45,7 @@ nuget FSharp.Data ~> 3.0-beta
group tests
source https://api.nuget.org/v3/index.json
storage: none
framework: net7.0, net8.0
framework: net8.0

nuget FSharp.Core
nuget Elmish ~> 4.0
Expand All @@ -78,27 +62,17 @@ nuget Swashbuckle.AspNetCore
nuget Unquote
nuget System.Text.Encodings.Web prerelease
nuget System.Text.Json prerelease

group tests-net7
source https://api.nuget.org/v3/index.json
storage: none
framework: net7.0

nuget Microsoft.AspNetCore.OpenApi ~> 7.0
nuget Microsoft.AspNetCore.Components.Authorization ~> 7.0
nuget Microsoft.AspNetCore.Components.WebAssembly ~> 7.0
nuget Microsoft.AspNetCore.Components.WebAssembly.Authentication ~> 7.0
nuget Microsoft.AspNetCore.Components.WebAssembly.DevServer ~> 7.0
nuget Microsoft.AspNetCore.Components.WebAssembly.Server ~> 7.0

group tests-net8
source https://api.nuget.org/v3/index.json
storage: none
framework: net8.0

nuget Microsoft.AspNetCore.Authorization ~> 8.0.0
nuget Microsoft.AspNetCore.OpenApi ~> 8.0.0
nuget Microsoft.AspNetCore.Components ~> 8.0
nuget Microsoft.AspNetCore.Components.Analyzers ~> 8.0
nuget Microsoft.AspNetCore.Components.Authorization ~> 8.0
nuget Microsoft.AspNetCore.Components.Forms ~> 8.0
nuget Microsoft.AspNetCore.Components.Web ~> 8.0
nuget Microsoft.AspNetCore.Components.WebAssembly ~> 8.0
nuget Microsoft.AspNetCore.Components.WebAssembly.Authentication ~> 8.0
nuget Microsoft.AspNetCore.Components.WebAssembly.DevServer ~> 8.0
nuget Microsoft.AspNetCore.Components.WebAssembly.Server ~> 8.0
nuget Microsoft.AspNetCore.Metadata ~> 8.0
nuget Microsoft.JSInterop ~> 8.0
nuget Microsoft.JSInterop.WebAssembly ~> 8.0
978 changes: 397 additions & 581 deletions paket.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Bolero.Html/Bolero.Html.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>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputType>Library</OutputType>
<RootNamespace>Bolero</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/Bolero.Server/Bolero.Server.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.Web">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<OutputType>Library</OutputType>
Expand Down
2 changes: 0 additions & 2 deletions src/Bolero.Server/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FSharp.Core
Nerdbank.GitVersioning
FSharp.SystemTextJson

group net8
Microsoft.JSInterop.WebAssembly
Microsoft.AspNetCore.Components.WebAssembly
Microsoft.AspNetCore.Components.Web
4 changes: 0 additions & 4 deletions src/Bolero.Server/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ excludeddependencies
nerdbank.gitversioning
include-pdbs true
files
obj\Release\net6.0\ref\Bolero.Server.dll ==> ref/net6.0
obj\Release\net7.0\ref\Bolero.Server.dll ==> ref/net7.0
obj\Release\net8.0\ref\Bolero.Server.dll ==> ref/net8.0
dependencies
framework: net6.0
framework: net7.0
framework: net8.0
Microsoft.AspNetCore.Components.Web >= 8.0
Microsoft.AspNetCore.Components.WebAssembly >= 8.0
Expand Down
2 changes: 1 addition & 1 deletion src/Bolero/Bolero.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>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<OutputType>Library</OutputType>
Expand Down
7 changes: 0 additions & 7 deletions src/Bolero/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,4 @@ Elmish
Nerdbank.GitVersioning
Microsoft.Extensions.Http
FSharp.SystemTextJson

group net8
Elmish
Microsoft.AspNetCore.Components
Microsoft.AspNetCore.Components.WebAssembly
Microsoft.JSInterop.WebAssembly
Microsoft.Extensions.Http
FSharp.SystemTextJson
12 changes: 0 additions & 12 deletions src/Bolero/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ files
obj/Release/typeproviders/fsharp41/netstandard2.0/HtmlAgilityPack.dll ==> typeproviders/fsharp41/netstandard2.0
obj/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Components.dll ==> typeproviders/fsharp41/netstandard2.0
obj/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Components.Web.dll ==> typeproviders/fsharp41/netstandard2.0
../Bolero.Html/bin/Release/net6.0/Bolero.Html.dll ==> lib/net6.0
../Bolero.Html/bin/Release/net6.0/Bolero.Html.xml ==> lib/net6.0
../Bolero.Html/bin/Release/net8.0/Bolero.Html.dll ==> lib/net8.0
../Bolero.Html/bin/Release/net8.0/Bolero.Html.xml ==> lib/net8.0
obj/Release/net6.0/ref/Bolero.dll ==> ref/net6.0
../Bolero.Html/obj/Release/net6.0/ref/Bolero.Html.dll ==> ref/net6.0
obj/Release/net8.0/ref/Bolero.dll ==> ref/net8.0
../Bolero.Html/obj/Release/net8.0/ref/Bolero.Html.dll ==> ref/net8.0
Bolero.targets ==> build
Expand All @@ -26,14 +22,6 @@ excludeddependencies
nerdbank.gitversioning
include-pdbs true
dependencies
framework: net6.0
Microsoft.JSInterop.WebAssembly ~> 6.0
Microsoft.AspNetCore.Components.WebAssembly ~> 6.0
Microsoft.AspNetCore.Components ~> 6.0
framework: net7.0
Microsoft.JSInterop.WebAssembly ~> 7.0
Microsoft.AspNetCore.Components.WebAssembly ~> 7.0
Microsoft.AspNetCore.Components ~> 7.0
framework: net8.0
Microsoft.JSInterop.WebAssembly >= 8.0
Microsoft.AspNetCore.Components.WebAssembly >= 8.0
Expand Down
2 changes: 0 additions & 2 deletions tests/Client/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
group tests
FSharp.Core
Elmish

group tests-net8
Microsoft.AspNetCore.Components.WebAssembly
Microsoft.AspNetCore.Components.WebAssembly.DevServer
2 changes: 0 additions & 2 deletions tests/Remoting.Client/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
group tests
FSharp.Core
Elmish

group tests-net8
Microsoft.Extensions.Configuration.Binder
Microsoft.AspNetCore.Components.WebAssembly.DevServer
Microsoft.AspNetCore.Components.Authorization
Expand Down
2 changes: 0 additions & 2 deletions tests/Remoting.Server/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ group tests
FSharp.Core
Swashbuckle.AspNetCore
FSharp.SystemTextJson.Swagger

group tests-net8
Microsoft.AspNetCore.OpenApi
Microsoft.AspNetCore.Components
Microsoft.AspNetCore.Components.WebAssembly
Expand Down
2 changes: 0 additions & 2 deletions tests/Server/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
group tests
FSharp.Core

group tests-net8
Microsoft.AspNetCore.Components
Microsoft.AspNetCore.Components.WebAssembly
Microsoft.AspNetCore.Components.WebAssembly.Server
2 changes: 0 additions & 2 deletions tests/Unit.Client/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
group tests
FSharp.Core
Elmish

group tests-net8
Microsoft.AspNetCore.Components.Authorization
Microsoft.AspNetCore.Components.WebAssembly.Authentication
Microsoft.AspNetCore.Components.WebAssembly
2 changes: 0 additions & 2 deletions tests/Unit/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Selenium.Support
Selenium.WebDriver
Selenium.WebDriver.ChromeDriver
Unquote

group tests-net8
Microsoft.AspNetCore.Components
Microsoft.AspNetCore.Components.WebAssembly
Microsoft.AspNetCore.Components.WebAssembly.Server
Loading