Skip to content

Commit 2328318

Browse files
ThoriumThorium
committed
some component updates.
Known issue: NUnit3TestAdapter not yet support .NET 7
1 parent 6ee92af commit 2328318

File tree

8 files changed

+49
-43
lines changed

8 files changed

+49
-43
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"paket": {
18-
"version": "7.1.5",
18+
"version": "7.2.0-alpha001",
1919
"commands": [
2020
"paket"
2121
]
2222
},
2323
"fake-cli": {
24-
"version": "5.22.0",
24+
"version": "5.23.1",
2525
"commands": [
2626
"fake"
2727
]

‎build.fsx

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,13 @@ Target.create "CleanDocs" (fun _ ->
124124
// Build library & test project
125125

126126
Target.create "Build" (fun _ ->
127-
Fake.DotNet.DotNet.exec id "build" "SQLProvider.sln -c Release" |> ignore
127+
Fake.DotNet.DotNet.build (fun p -> {p with Configuration = DotNet.BuildConfiguration.Release}) "SQLProvider.sln"
128128
)
129129

130130
Target.create "BuildTests" (fun _ ->
131-
Fake.DotNet.DotNet.exec id "build" "SQLProvider.Tests.sln -c Release" |> ignore
131+
Fake.DotNet.DotNet.build (fun p -> {p with Configuration = DotNet.BuildConfiguration.Release}) "SQLProvider.Tests.sln"
132132
)
133133

134-
135134
// --------------------------------------------------------------------------------------
136135
// Set up a PostgreSQL database in the CI pipeline to run tests
137136

@@ -305,8 +304,11 @@ Target.create "PackNuGet" (fun _ ->
305304
Symbols = true
306305
})
307306

308-
Branches.tag "" release.NugetVersion
309-
307+
try
308+
Branches.tag "" release.NugetVersion
309+
with
310+
| e ->
311+
printfn "Git tag fail: %s" e.Message
310312
()
311313
)
312314

@@ -412,9 +414,12 @@ Target.create "ReleaseDocs" (fun _ ->
412414

413415
Fake.IO.Shell.deleteDir tempDocsDir
414416
Fake.IO.Shell.copyRecursive "docs/output" tempDocsDir true |> Fake.Core.Trace.tracefn "%A"
415-
Git.Staging.stageAll tempDocsDir
416-
Git.Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion)
417-
Branches.push tempDocsDir
417+
if not (System.IO.Directory.Exists tempDocsDir) then
418+
printfn "GH Pages not found, couldn't release."
419+
else
420+
Git.Staging.stageAll tempDocsDir
421+
Git.Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion)
422+
Branches.push tempDocsDir
418423
)
419424

420425
Target.create "Release" (fun _ ->
@@ -466,4 +471,5 @@ Target.create "BuildDocs" ignore
466471
"All"
467472
==> "Release"
468473

474+
// Change target via command-line: build -t PackNuGet
469475
Target.runOrDefaultWithArguments "RunTests"

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.400",
3+
"version": "6.0.403",
44
"rollForward": "minor"
55
}
66
}

‎paket.dependencies

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
version 5.198.0
1+
version 6.2.1
22
source https://api.nuget.org/v3/index.json
33
frameworks: net472, netcoreapp3.1, netstandard2.0
44
storage: none
55
clitool dotnet-mono 0.5.2
66

7-
nuget FSharp.Core == 6.0.5
7+
nuget FSharp.Core == 6.0.7
88
nuget System.Data.SqlClient
99
nuget NETStandard.Library.NETFramework storage: packages
1010
nuget System.Data.OleDb
@@ -26,7 +26,7 @@ group Build
2626
storage: packages
2727

2828
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
29-
nuget FSharp.Core == 6.0.5
29+
nuget FSharp.Core == 6.0.7
3030
nuget FSharp.Formatting >= 4.0.0
3131
nuget Nuget.CommandLine
3232
nuget RazorEngine

‎paket.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ NUGET
1515
Microsoft.Build (>= 15.6.82) - restriction: || (&& (== net472) (>= netcoreapp1.0)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp1.0))
1616
Microsoft.Build.Utilities.Core (>= 15.6.82) - restriction: || (&& (== net472) (>= netcoreapp1.0)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp1.0))
1717
Microsoft.NETCore.App (>= 2.0) - restriction: || (&& (== net472) (>= netcoreapp2.0)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0))
18-
FSharp.Core (6.0.5)
18+
FSharp.Core (6.0.7)
1919
Microsoft.Build (17.2) - restriction: || (&& (== net472) (>= netcoreapp1.0)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp1.0))
2020
Microsoft.Build.Framework (17.2) - restriction: || (&& (== net472) (>= netcoreapp1.0)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp1.0))
2121
Microsoft.Win32.Registry (>= 4.3) - restriction: || (&& (== net472) (>= net6.0)) (== netcoreapp3.1) (== netstandard2.0)
@@ -49,8 +49,8 @@ NUGET
4949
Microsoft.NETCore.Platforms (6.0.5) - storage: packages
5050
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net472) (< net45)) (&& (== net472) (>= netcoreapp2.2)) (== netcoreapp3.1) (== netstandard2.0)
5151
Microsoft.Win32.Registry (5.0) - restriction: || (&& (== net472) (< net461)) (&& (== net472) (>= net6.0)) (&& (== net472) (>= netcoreapp3.1)) (== netcoreapp3.1) (== netstandard2.0)
52-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net472) (>= monoandroid) (< netstandard1.3)) (&& (== net472) (>= monotouch)) (&& (== net472) (< net46)) (&& (== net472) (>= xamarinios)) (&& (== net472) (>= xamarinmac)) (&& (== net472) (>= xamarintvos)) (&& (== net472) (>= xamarinwatchos)) (&& (== netcoreapp3.1) (>= monoandroid) (< netstandard1.3)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0)
53-
System.Memory (>= 4.5.4) - restriction: || (&& (== net472) (< net46)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
52+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (>= monoandroid) (< netstandard1.3)) (&& (== net472) (>= monotouch)) (&& (== net472) (< net46)) (&& (== net472) (>= xamarinios)) (&& (== net472) (>= xamarinmac)) (&& (== net472) (>= xamarintvos)) (&& (== net472) (>= xamarinwatchos)) (&& (== netcoreapp3.1) (>= monoandroid) (< netstandard1.3)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0)
53+
System.Memory (>= 4.5.4) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net46)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
5454
System.Security.AccessControl (>= 5.0)
5555
System.Security.Principal.Windows (>= 5.0)
5656
Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (&& (== net472) (>= net6.0)) (&& (== net472) (>= netcoreapp3.1)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp3.1))
@@ -111,14 +111,14 @@ NUGET
111111
System.Diagnostics.PerformanceCounter (>= 6.0) - restriction: || (&& (== net472) (< net461)) (&& (== net472) (>= net6.0)) (== netcoreapp3.1) (== netstandard2.0)
112112
System.Memory (>= 4.5.4) - restriction: || (&& (== net472) (< net461)) (== netcoreapp3.1) (== netstandard2.0)
113113
System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net472) (< net461)) (== netcoreapp3.1) (== netstandard2.0)
114-
System.Data.SqlClient (4.8.3)
114+
System.Data.SqlClient (4.8.5)
115115
Microsoft.Win32.Registry (>= 4.7) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp3.1)) (== netcoreapp3.1) (== netstandard2.0)
116116
runtime.native.System.Data.SqlClient.sni (>= 4.7) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp3.1)) (== netcoreapp3.1) (== netstandard2.0)
117-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net472) (< net451)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0)
118-
System.Diagnostics.DiagnosticSource (>= 4.7) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
119-
System.Memory (>= 4.5.4) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
117+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net451)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0)
118+
System.Diagnostics.DiagnosticSource (>= 4.7) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
119+
System.Memory (>= 4.5.4) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
120120
System.Security.Principal.Windows (>= 4.7) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp3.1)) (== netcoreapp3.1) (== netstandard2.0)
121-
System.Text.Encoding.CodePages (>= 4.7) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
121+
System.Text.Encoding.CodePages (>= 4.7) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
122122
System.Diagnostics.DiagnosticSource (6.0) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
123123
System.Memory (>= 4.5.4)
124124
System.Runtime.CompilerServices.Unsafe (>= 6.0)
@@ -140,7 +140,7 @@ NUGET
140140
System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== netcoreapp3.1) (== netstandard2.0)
141141
System.Memory (4.5.5)
142142
System.Buffers (>= 4.5.1) - restriction: || (== net472) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0)
143-
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0)
143+
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0)
144144
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net472) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0)
145145
System.Numerics.Vectors (4.5) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0)
146146
System.Reflection (4.3)
@@ -196,12 +196,12 @@ NUGET
196196
System.Text.Encoding.CodePages (6.0) - restriction: || (&& (== net472) (< net451)) (&& (== net472) (>= netcoreapp2.0)) (&& (== net472) (>= netcoreapp2.1)) (&& (== net472) (>= netcoreapp3.1)) (&& (== net472) (>= uap10.1)) (== netcoreapp3.1) (== netstandard2.0)
197197
System.Runtime.CompilerServices.Unsafe (>= 6.0)
198198
System.Text.RegularExpressions (4.3.1) - restriction: || (&& (== net472) (< net451)) (== netcoreapp3.1) (== netstandard2.0)
199-
System.Collections (>= 4.3) - restriction: || (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
200-
System.Globalization (>= 4.3) - restriction: || (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
201-
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
199+
System.Collections (>= 4.3) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
200+
System.Globalization (>= 4.3) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
201+
System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
202202
System.Runtime (>= 4.3.1) - restriction: || (&& (== net472) (< net45)) (&& (== net472) (>= netcoreapp1.1)) (== netcoreapp3.1) (== netstandard2.0)
203-
System.Runtime.Extensions (>= 4.3.1) - restriction: || (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
204-
System.Threading (>= 4.3) - restriction: || (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
203+
System.Runtime.Extensions (>= 4.3.1) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
204+
System.Threading (>= 4.3) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
205205
System.Threading (4.3) - restriction: || (&& (== net472) (== netcoreapp3.1)) (&& (== net472) (< net45)) (&& (== netcoreapp3.1) (< netcoreapp1.1)) (== netstandard2.0)
206206
System.Runtime (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== netcoreapp3.1) (== netstandard2.0)
207207
System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== netcoreapp3.1) (== netstandard2.0)
@@ -949,7 +949,7 @@ NUGET
949949
FSharp.Control.Reactive (5.0.5) - restriction: >= netstandard2.0
950950
FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0
951951
System.Reactive (>= 5.0 < 6.0) - restriction: >= netstandard2.0
952-
FSharp.Core (6.0.5)
952+
FSharp.Core (6.0.7)
953953
FSharp.Formatting (15.0.2)
954954
FSharp.Compiler.Service (41.0.4) - restriction: >= netstandard2.1
955955
Microsoft.AspNet.Razor (2.0.30506) - restriction: && (>= net40) (< net45)
@@ -1789,7 +1789,7 @@ NUGET
17891789
System.Xml.ReaderWriter (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
17901790
GITHUB
17911791
remote: fsharp/FAKE
1792-
modules/Octokit/Octokit.fsx (5267477da251ed621165d31178ab9fba69de6e2f)
1792+
modules/Octokit/Octokit.fsx (ada1877316c83eebb6c3695dd8e234c906276a0d)
17931793
Octokit (>= 0.20)
17941794
GROUP Docs
17951795
STORAGE: NONE
@@ -2512,23 +2512,23 @@ NUGET
25122512
FirebirdSql.Data.FirebirdClient (5.12.1)
25132513
Microsoft.Extensions.PlatformAbstractions (>= 1.1)
25142514
System.Reflection.Emit (>= 4.3)
2515-
Microsoft.CodeCoverage (17.2)
2515+
Microsoft.CodeCoverage (17.4)
25162516
Microsoft.Data.Sqlite.Core (6.0.8)
25172517
SQLitePCLRaw.core (>= 2.0.6)
25182518
Microsoft.Extensions.PlatformAbstractions (1.1)
25192519
NETStandard.Library (>= 1.6.1)
25202520
System.Reflection.TypeExtensions (>= 4.3)
2521-
Microsoft.NET.Test.Sdk (17.2)
2522-
Microsoft.CodeCoverage (>= 17.2)
2523-
Microsoft.TestPlatform.TestHost (>= 17.2)
2521+
Microsoft.NET.Test.Sdk (17.4)
2522+
Microsoft.CodeCoverage (>= 17.4)
2523+
Microsoft.TestPlatform.TestHost (>= 17.4)
25242524
Microsoft.NETCore.Platforms (6.0.5)
25252525
Microsoft.NETCore.Targets (5.0)
2526-
Microsoft.TestPlatform.ObjectModel (17.2)
2526+
Microsoft.TestPlatform.ObjectModel (17.4)
25272527
NuGet.Frameworks (>= 5.11)
25282528
System.Reflection.Metadata (>= 1.6)
2529-
Microsoft.TestPlatform.TestHost (17.2)
2530-
Microsoft.TestPlatform.ObjectModel (>= 17.2)
2531-
Newtonsoft.Json (>= 9.0.1)
2529+
Microsoft.TestPlatform.TestHost (17.4)
2530+
Microsoft.TestPlatform.ObjectModel (>= 17.4)
2531+
Newtonsoft.Json (>= 13.0.1)
25322532
Microsoft.Win32.Primitives (4.3)
25332533
Microsoft.NETCore.Platforms (>= 1.1)
25342534
Microsoft.NETCore.Targets (>= 1.1)
@@ -2557,7 +2557,7 @@ NUGET
25572557
NuGet.Frameworks (6.3)
25582558
NUnit (3.13.3)
25592559
NETStandard.Library (>= 2.0)
2560-
NUnit3TestAdapter (4.2.1)
2560+
NUnit3TestAdapter (4.3)
25612561
Oracle.ManagedDataAccess (12.2.1100)
25622562
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
25632563
runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)

‎src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<!-- See https://stackoverflow.com/questions/43921992/how-can-i-use-beforebuild-and-afterbuild-targets-with-visual-studio-2017 -->
44
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
@@ -70,18 +70,19 @@
7070
</ItemGroup>
7171
<ItemGroup>
7272
<!-- Be explicit about the version of FSharp.Core since we mention it in the manual nuget package spec -->
73-
<PackageReference Include="FSharp.Core" Version="6.0.5" />
7473
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0">
7574
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7675
<PrivateAssets>all</PrivateAssets>
7776
</PackageReference>
7877
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
7978
</ItemGroup>
8079
<Target Name="BeforeBuild">
80+
<!--
8181
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Restore" />
8282
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netcoreapp3.1" />
8383
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
8484
<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net472" />
85+
-->
8586
</Target>
8687
<Target Name="AfterBuild">
8788
</Target>

‎src/SQLProvider.Runtime/paket.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ files
3232
references
3333
FSharp.Data.SqlProvider.dll
3434
dependencies
35-
FSharp.Core >= 6.0.5
35+
FSharp.Core >= 6.0.7
3636
Newtonsoft.Json >= 13.0.1
3737
System.Net.Http >= 4.3.4

‎tests/SqlProvider.Tests/SqlProvider.Tests.fsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<ProjectReference Include="..\..\src\SQLProvider.Runtime\SQLProvider.Runtime.fsproj" />
4848
</ItemGroup>
4949
<ItemGroup>
50-
<PackageReference Include="Fsharp.Core" Version="6.0.5" />
5150
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
5251
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.0">
5352
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)