Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,43 @@
"version": "3.1.1",
"commands": [
"sourcelink"
]
],
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "4.2.15",
"commands": [
"reportgenerator"
]
],
"rollForward": false
},
"paket": {
"version": "6.0.13",
"version": "9.0.2",
"commands": [
"paket"
]
],
"rollForward": false
},
"fcswatch-cli": {
"version": "0.7.14",
"commands": [
"fcswatch"
]
],
"rollForward": false
},
"fsharp-analyzers": {
"version": "0.9.0",
"commands": [
"fsharp-analyzers"
]
],
"rollForward": false
},
"fantomas-tool": {
"version": "4.5.6",
"commands": [
"fantomas"
]
"fantomas"
],
"rollForward": false
}
}
}
}
8 changes: 5 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# Not specifying a version will attempt to install via global.json
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: |
6.0.x
8.0.x

- name: Build
if: runner.os != 'Windows'
Expand Down
1,002 changes: 505 additions & 497 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- summary is not migrated from project.json, but you can use the <Description> property for that if needed. -->
<PackageTags>f#, fsharp</PackageTags>
<PackageProjectUrl>https://github.com/efcore/EFCore.FSharp</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/efcore/EFCore.FSharp/blob/master/LICENSE.md</PackageLicenseUrl>
<PackageLicense>MIT</PackageLicense>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<Authors>efcore</Authors>
Expand Down
2 changes: 1 addition & 1 deletion build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ let updateChangelog ctx =
|> List.ofSeq
|> List.rev

let isRef line =
let isRef (line: string) =
System.Text.RegularExpressions.Regex.IsMatch(line, @"^\[.+?\]:\s?[a-z]+://.*$")

let linkReferenceTargets =
Expand Down
2 changes: 1 addition & 1 deletion build/build.fsproj
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>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion docsTool/docsTool.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100",
"version": "8.0.100",
"rollForward": "latestMinor"
}
}
63 changes: 36 additions & 27 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ group Src

nuget FSharp.Core 6.0.1
nuget Microsoft.SourceLink.GitHub 1.0.0 copy_local: true
nuget Microsoft.EntityFrameworkCore.Design ~> 6.0.0
nuget Microsoft.EntityFrameworkCore 8.0.0
nuget Microsoft.EntityFrameworkCore.Abstractions 8.0.0
nuget Microsoft.EntityFrameworkCore.Relational 8.0.0
nuget Microsoft.EntityFrameworkCore.Design 8.0.0

group Tests
source https://www.nuget.org/api/v2
Expand All @@ -14,20 +17,22 @@ group Tests

nuget System.Collections.Immutable >= 6.0.0

nuget FSharp.Core 6.0.1
nuget FSharp.Core 8.0.100
nuget Microsoft.SourceLink.GitHub 1.0.0 copy_local: true
nuget Expecto 9.0.2
nuget YoloDev.Expecto.TestSdk 0.12.10
nuget Microsoft.NET.Test.Sdk 17.0.0
nuget altcover ~> 8.2.828

nuget Microsoft.EntityFrameworkCore.Design ~> 6.0.0
nuget Microsoft.EntityFrameworkCore.InMemory ~> 6.0.0
nuget Microsoft.EntityFrameworkCore.Relational ~> 6.0.0
nuget Microsoft.EntityFrameworkCore.Sqlite ~> 6.0.0
nuget Microsoft.EntityFrameworkCore.SqlServer ~> 6.0.0
nuget Microsoft.EntityFrameworkCore.Specification.Tests ~> 6.0.0
nuget FSharp.Compiler.Service 41.0.1
nuget Microsoft.EntityFrameworkCore 8.0.0
nuget Microsoft.EntityFrameworkCore.Abstractions 8.0.0
nuget Microsoft.EntityFrameworkCore.Design 8.0.0
nuget Microsoft.EntityFrameworkCore.InMemory 8.0.0
nuget Microsoft.EntityFrameworkCore.Relational 8.0.0
nuget Microsoft.EntityFrameworkCore.Sqlite 8.0.0
nuget Microsoft.EntityFrameworkCore.SqlServer 8.0.0
nuget Microsoft.EntityFrameworkCore.Specification.Tests 8.0.0
nuget FSharp.Compiler.Service 43.8.100
nuget Microsoft.CodeAnalysis >= 3.8.0
nuget NetTopologySuite.IO.SqlServerBytes 2.0.0
nuget System.Runtime.Numerics
Expand All @@ -38,34 +43,38 @@ group Build
storage: none
source https://www.nuget.org/api/v2
source https://api.nuget.org/v3/index.json
nuget Fake.IO.FileSystem 5.20.4
nuget Fake.Core.Target 5.20.4
nuget Fake.Core.ReleaseNotes 5.20.4
nuget FAKE.Core.Environment 5.20.4
nuget Fake.DotNet.Cli 5.20.4
nuget FAKE.Core.Process 5.20.4
nuget Fake.DotNet.AssemblyInfoFile 5.20.4
nuget Fake.Tools.Git 5.20.4
nuget Fake.DotNet.Paket 5.20.4
nuget Fake.Api.GitHub 5.20.4
nuget Fake.BuildServer.GitHubActions 5.20.4
nuget Fake.IO.FileSystem 6.1.3
nuget Fake.Core.Target 6.1.3
nuget Fake.Core.ReleaseNotes 6.1.3
nuget FAKE.Core.Environment 6.1.3
nuget Fake.DotNet.Cli 6.1.3
nuget FAKE.Core.Process 6.1.3
nuget Fake.DotNet.AssemblyInfoFile 6.1.3
nuget Fake.Tools.Git 6.1.3
nuget Fake.DotNet.Paket 6.1.3
nuget Fake.Api.GitHub 6.1.3
nuget Fake.BuildServer.GitHubActions 6.1.3
nuget Argu
nuget Octokit 0.48
nuget MSBuild.StructuredLogger ~> 2.1.176

group Docs
storage: none
source https://www.nuget.org/api/v2
source https://api.nuget.org/v3/index.json

nuget Argu
nuget FSharp.Compiler.Service 34.1.0
nuget FSharp.Core ~> 4.6
nuget Fake.IO.FileSystem 5.20.4
nuget FAKE.Core.Environment 5.20.4
nuget Fake.DotNet.Cli 5.20.4
nuget FSharp.Core ~> 8.0
nuget Fake.IO.FileSystem 6.1.3
nuget FAKE.Core.Environment 6.1.3
nuget Fake.DotNet.Cli 6.1.3
nuget FSharp.Formatting 4.0.0-rc1
nuget FSharp.Literate 4.0.0-rc1
nuget Fable.React
nuget Microsoft.EntityFrameworkCore.Sqlite ~> 5.0.11
nuget Microsoft.EntityFrameworkCore 6.0.0
nuget Microsoft.EntityFrameworkCore.Abstractions 6.0.0
nuget Microsoft.EntityFrameworkCore.Relational 6.0.0
nuget Microsoft.EntityFrameworkCore.Sqlite.Core 6.0.0
nuget Microsoft.EntityFrameworkCore.Sqlite 6.0.0

group Analyzers
source https://www.nuget.org/api/v2
Expand Down
Loading
Loading