Skip to content

Upgrade project to dotnet 6 #117

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

Draft
chengh42 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Upgrade project to dotnet 6 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"isRoot": true,
"tools": {
"paket": {
"version": "6.0.7",
"version": "7.2.1",
"commands": [
"paket"
]
},
"fable": {
"version": "3.2.11",
"version": "4.1.2",
"commands": [
"fable"
]
},
"fantomas-tool": {
"version": "4.5.2",
"version": "4.7.9",
"commands": [
"fantomas"
]
},
"femto": {
"version": "0.9.0",
"version": "0.17.0",
"commands": [
"femto"
]
Expand Down
18 changes: 18 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"image": "mcr.microsoft.com/devcontainers/dotnet:6.0",
"features": {
"ghcr.io/devcontainers/features/dotnet:1": {},
"ghcr.io/devcontainers/features/node:1": {
"version": "16"
}
},
"customizations": {
"vscode": {
"extensions": [
"Ionide.Ionide-fsharp",
"EditorConfig.EditorConfig",
"ms-dotnettools.csharp"
]
}
}
}
1,114 changes: 557 additions & 557 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Build.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>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Helpers.fs" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Fable library for [@auth0/auth0-react](https://github.com/auth0/auth0-react), th

## Prerequisite

* [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
* [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
* [Node.js](https://nodejs.org/)
* [npm](https://www.npmjs.com/) or [yarn](https://yarnpkg.com/) as the package manager
* [React](https://reactjs.org/) >= 16.8
Expand Down
2 changes: 1 addition & 1 deletion docs/Docs.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>
<DefineConstants>FABLE_COMPILER</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion 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.100",
"version": "6.0.0",
"rollForward": "latestMinor"
}
}
4 changes: 2 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source https://api.nuget.org/v3/index.json
framework: net5.0, netstandard2.0
framework: net6.0, netstandard2.0
storage: none

nuget Fable.Core
nuget Fable.Elmish
nuget Fable.Elmish.React
nuget Fable.Elmish.Debugger
nuget Fable.Elmish.HMR == 4.1 // https://github.com/elmish/hmr/issues/35
nuget Fable.Elmish.HMR
nuget Fable.MaterialUI.Icons
nuget Fable.React
nuget Fable.SimpleHttp
Expand Down
190 changes: 92 additions & 98 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
STORAGE: NONE
RESTRICTION: || (== net5.0) (== netstandard2.0)
RESTRICTION: || (== net6.0) (== netstandard2.0)
NUGET
remote: https://api.nuget.org/v3/index.json
Fable.AST (3.1.1)
Fable.AST (4.2.1)
Fable.Browser.Blob (1.1.4)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Expand All @@ -28,127 +28,121 @@ NUGET
Fable.Browser.Event (>= 1.4.4)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Core (3.6.1)
Fable.Elmish (3.1)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.6.2)
Fable.Elmish.Browser (3.0.4)
Fable.Browser.Dom (>= 1.0)
Fable.Core (>= 3.0)
Fable.Elmish (>= 3.0)
FSharp.Core (>= 4.6.2)
Fable.Elmish.Debugger (3.3)
Fable.Core (>= 3.2.8)
Fable.Elmish (>= 3.0)
Fable.Core (4.0)
Fable.Elmish (4.0.1)
Fable.Core (>= 3.7.1)
FSharp.Core (>= 4.7.2)
Fable.Elmish.Debugger (4.0)
Fable.Elmish (>= 4.0)
FSharp.Core (>= 6.0.7)
Thoth.Json (>= 6.0)
Fable.Elmish.HMR (4.1)
Fable.Core (>= 3.0)
Fable.Elmish.Browser (>= 3.0.4)
Fable.Elmish.React (>= 3.0.1)
FSharp.Core (>= 4.6.2)
Fable.Elmish.React (3.0.1)
Fable.Core (>= 3.0)
Fable.Elmish (>= 3.0)
Fable.React (>= 5.1)
FSharp.Core (>= 4.6.2)
Fable.Elmish.HMR (7.0)
Fable.Core (>= 3.7.1)
Fable.Elmish.React (>= 4.0)
FSharp.Core (>= 4.7.2)
Fable.Elmish.React (4.0)
Fable.Elmish (>= 4.0)
Fable.ReactDom.Types (>= 18.0)
FSharp.Core (>= 4.7.2)
Fable.MaterialUI.Icons (1.3)
Fable.Core (>= 3.0)
Fable.React (>= 5.2.1)
Fable.React (7.4.3)
Fable.React (9.3)
Fable.React.Types (>= 18.3)
Fable.ReactDom.Types (>= 18.2)
FSharp.Core (>= 4.7.2)
Fable.React.Types (18.3)
Fable.Browser.Dom (>= 2.4.4)
Fable.Core (>= 3.2.7)
FSharp.Core (>= 4.7.2)
Fable.SimpleHttp (3.1)
Fable.ReactDom.Types (18.2)
Fable.React.Types (>= 18.3)
FSharp.Core (>= 4.7.2)
Fable.SimpleHttp (3.5)
Fable.Browser.Dom (>= 1.0)
Fable.Browser.XMLHttpRequest (>= 1.1)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.6.2)
Fake.Core.CommandLineParsing (5.21.1)
Fake.Core.CommandLineParsing (6.0)
FParsec (>= 1.1.1)
FSharp.Core (>= 6.0)
Fake.Core.Context (5.21.1)
FSharp.Core (>= 6.0)
Fake.Core.Environment (5.21.1)
FSharp.Core (>= 6.0)
Fake.Core.FakeVar (5.21.1)
Fake.Core.Context (>= 5.21.1)
FSharp.Core (>= 6.0)
Fake.Core.Process (5.21.1)
Fake.Core.Environment (>= 5.21.1)
Fake.Core.FakeVar (>= 5.21.1)
Fake.Core.String (>= 5.21.1)
Fake.Core.Trace (>= 5.21.1)
Fake.IO.FileSystem (>= 5.21.1)
FSharp.Core (>= 6.0)
System.Collections.Immutable (>= 5.0)
Fake.Core.String (5.21.1)
FSharp.Core (>= 6.0)
Fake.Core.Target (5.21.1)
Fake.Core.CommandLineParsing (>= 5.21.1)
Fake.Core.Context (>= 5.21.1)
Fake.Core.Environment (>= 5.21.1)
Fake.Core.FakeVar (>= 5.21.1)
Fake.Core.Process (>= 5.21.1)
Fake.Core.String (>= 5.21.1)
Fake.Core.Trace (>= 5.21.1)
FSharp.Core (>= 6.0.3)
Fake.Core.Context (6.0)
FSharp.Core (>= 6.0.3)
Fake.Core.Environment (6.0)
FSharp.Core (>= 6.0.3)
Fake.Core.FakeVar (6.0)
Fake.Core.Context (>= 6.0)
FSharp.Core (>= 6.0.3)
Fake.Core.Process (6.0)
Fake.Core.Environment (>= 6.0)
Fake.Core.FakeVar (>= 6.0)
Fake.Core.String (>= 6.0)
Fake.Core.Trace (>= 6.0)
Fake.IO.FileSystem (>= 6.0)
FSharp.Core (>= 6.0.3)
System.Collections.Immutable (>= 6.0)
Fake.Core.String (6.0)
FSharp.Core (>= 6.0.3)
Fake.Core.Target (6.0)
Fake.Core.CommandLineParsing (>= 6.0)
Fake.Core.Context (>= 6.0)
Fake.Core.Environment (>= 6.0)
Fake.Core.FakeVar (>= 6.0)
Fake.Core.Process (>= 6.0)
Fake.Core.String (>= 6.0)
Fake.Core.Trace (>= 6.0)
FSharp.Control.Reactive (>= 5.0.2)
FSharp.Core (>= 6.0)
Fake.Core.Trace (5.21.1)
Fake.Core.Environment (>= 5.21.1)
Fake.Core.FakeVar (>= 5.21.1)
FSharp.Core (>= 6.0)
Fake.IO.FileSystem (5.21.1)
Fake.Core.String (>= 5.21.1)
FSharp.Core (>= 6.0)
Feliz (1.58)
Fable.Core (>= 3.1.5)
Fable.React (>= 7.4)
Feliz.CompilerPlugins (>= 1.6)
FSharp.Core (>= 4.7.2)
Feliz.CompilerPlugins (1.6)
Fable.AST (>= 3.0)
FSharp.Core (>= 4.7.2)
Feliz.DaisyUI (1.4)
Feliz (>= 1.32)
FSharp.Core (>= 4.7.2)
Feliz.Router (3.8)
Fable.Core (>= 3.1.6)
Fable.Elmish (>= 3.1)
Feliz (>= 1.28)
Feliz.UseListener (>= 0.6.3)
FSharp.Core (>= 6.0.3)
Fake.Core.Trace (6.0)
Fake.Core.Environment (>= 6.0)
Fake.Core.FakeVar (>= 6.0)
FSharp.Core (>= 6.0.3)
Fake.IO.FileSystem (6.0)
Fake.Core.String (>= 6.0)
Fake.Core.Trace (>= 6.0)
FSharp.Core (>= 6.0.3)
Feliz (2.6)
Fable.ReactDom.Types (>= 18.2)
Feliz.CompilerPlugins (>= 2.2)
FSharp.Core (>= 4.7.2)
Feliz.CompilerPlugins (2.2)
Fable.AST (>= 4.2.1)
FSharp.Core (>= 4.7.2)
Feliz.DaisyUI (3.0)
Feliz (>= 2.4.1)
FSharp.Core (>= 4.7.2)
Feliz.UseListener (0.6.3)
Fable.Core (>= 3.1.6 < 4.0)
Feliz (>= 1.17 < 2.0)
Feliz.Router (4.0)
Fable.Elmish (>= 4.0)
Feliz (>= 2.3)
FSharp.Core (>= 4.7.2)
FParsec (1.1.1)
FSharp.Core (>= 4.3.4)
FSharp.Control.Reactive (5.0.2)
FSharp.Core (>= 4.7.2)
System.Reactive (>= 5.0)
FSharp.Core (6.0.1)
Microsoft.NETCore.Platforms (6.0.1) - restriction: || (&& (== net5.0) (< netcoreapp3.1)) (&& (== net5.0) (< netstandard1.2)) (&& (== net5.0) (< netstandard1.3)) (&& (== net5.0) (< netstandard1.5)) (== netstandard2.0)
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net5.0) (< netcoreapp3.1)) (&& (== net5.0) (< netstandard1.2)) (&& (== net5.0) (< netstandard1.3)) (&& (== net5.0) (< netstandard1.5)) (== netstandard2.0)
System.Buffers (4.5.1) - restriction: || (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarinios)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarinmac)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarintvos)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarinwatchos)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
System.Collections.Immutable (5.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
System.Memory (4.5.4) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net5.0) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
FSharp.Core (7.0.200)
Microsoft.NETCore.Platforms (6.0.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.2)) (&& (== net6.0) (< netstandard1.3)) (&& (== net6.0) (< netstandard1.5)) (== netstandard2.0)
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.2)) (&& (== net6.0) (< netstandard1.3)) (&& (== net6.0) (< netstandard1.5)) (== netstandard2.0)
System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Collections.Immutable (7.0)
System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Reactive (5.0)
System.Runtime.InteropServices.WindowsRuntime (>= 4.3) - restriction: || (&& (== net5.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net5.0) (>= net472)) (&& (== net5.0) (< netcoreapp3.1)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
System.Runtime (4.3.1) - restriction: || (&& (== net5.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Runtime.InteropServices.WindowsRuntime (>= 4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
System.Runtime (4.3.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
Microsoft.NETCore.Platforms (>= 1.1.1)
Microsoft.NETCore.Targets (>= 1.1.3)
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
System.Runtime.InteropServices.WindowsRuntime (4.3) - restriction: || (&& (== net5.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (6.0)
System.Runtime.InteropServices.WindowsRuntime (4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Runtime (>= 4.3)
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net5.0) (>= net472)) (&& (== net5.0) (< netcoreapp3.1)) (&& (== net5.0) (>= uap10.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard1.0)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= wp8)) (== netstandard2.0)
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0)
Thoth.Json (7.0)
Fable.Core (>= 3.1.6)
FSharp.Core (>= 4.7.2)