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

net8 tfm #38

Merged
merged 1 commit into from
Jan 28, 2024
Merged

net8 tfm #38

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
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 @@ -9,7 +9,7 @@
]
},
"paket": {
"version": "8.0.0-alpha002",
"version": "8.0.3",
"commands": [
"paket"
]
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"ghcr.io/devcontainers-contrib/features/starship:1": {},
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "7.0",
"additionalVersions": "6.0"
"version": "8.0",
"additionalVersions": "6.0, 7.0"
}
},
"overrideFeatureInstallOrder": [
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
with:
global-json-file: global.json
dotnet-version: |
8.x
7.x
6.x
# Build on mac/linux
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/fsdocs-gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
with:
global-json-file: global.json
dotnet-version: |
8.x
7.x
6.x
- name: Build Docs
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ jobs:
with:
global-json-file: global.json
dotnet-version: |
6.x
8.x
7.x
6.x
- name: publish
env:
NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
Expand Down
997 changes: 500 additions & 497 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.400"
"version": "8.0.100"
}
}
1 change: 1 addition & 0 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ group Test
source https://www.nuget.org/api/v2
source https://api.nuget.org/v3/index.json
nuget Expecto >= 10.1.0
nuget Microsoft.Bcl.TimeProvider
nuget TimeProviderExtensions
nuget YoloDev.Expecto.TestSdk >= 0.14.2
nuget Microsoft.NET.Test.Sdk >= 17.7.2
Expand Down
2 changes: 1 addition & 1 deletion paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ NUGET
FSharp.Core (7.0.401) - restriction: >= netstandard2.1
Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netstandard2.0)) (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0))
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
Microsoft.Bcl.TimeProvider (8.0) - restriction: || (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0))
Microsoft.Bcl.TimeProvider (8.0)
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.ValueTuple (>= 4.5) - restriction: >= net462
Microsoft.CodeCoverage (17.7.2) - restriction: || (>= net462) (>= netcoreapp3.1)
Expand Down
2 changes: 1 addition & 1 deletion tests/IcedTasks.Tests.NS20/IcedTasks.Tests.NS20.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>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;net7.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<DefineConstants>$(DefineConstants);NETSTANDARD2_0;TEST_NETSTANDARD2_0</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/IcedTasks.Tests.NS21/IcedTasks.Tests.NS21.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>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;net7.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<DefineConstants>$(DefineConstants);NETSTANDARD2_1;TEST_NETSTANDARD2_1</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/IcedTasks.Tests/IcedTasks.Tests.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>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<DefineConstants>$(DefineConstants);TEST_NET6_0_OR_GREATER</DefineConstants>
</PropertyGroup>
Expand Down
Loading