Skip to content

Commit 3f081c0

Browse files
EverybodyKurtsEverybodyKurts
committed
Resolve merge conflicts
1 parent 0884b4f commit 3f081c0

19 files changed

+506
-409
lines changed

‎.config/dotnet-tools.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"version": 1,
33
"isRoot": true,
44
"tools": {
5-
"fsdocs-tool": {
6-
"version": "20.0.1",
5+
"paket": {
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
],
1010
"rollForward": false
1111
},
12-
"paket": {
13-
"version": "9.0.2",
12+
"fsdocs-tool": {
13+
"version": "20.0.1",
1414
"commands": [
1515
"fsdocs"
1616
],

‎.github/workflows/pull-requests.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,14 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- uses: actions/checkout@v1
39-
- name: Setup .NET Core 6
40-
uses: actions/setup-dotnet@v1
41-
with:
42-
dotnet-version: 6.0.425
43-
- name: Setup .NET Core 8
39+
- name: Setup .NET Core 9
4440
uses: actions/setup-dotnet@v1
4541
with:
4642
dotnet-version: 8.0.400
4743
- name: Restore .NET local tools
4844
run: dotnet tool restore
4945
- name: Restore packages
5046
run: dotnet paket restore
51-
- name: Format code
52-
run: dotnet fake build -t Format
5347
- name: Build and test
5448
run: dotnet run --project build/build.fsproj -- -t RunTests
5549
- name: Build (Debug)

‎RELEASE_NOTES.md

Lines changed: 454 additions & 352 deletions
Large diffs are not rendered by default.

‎build/build.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ let buildscript () =
215215
if result.ExitCode = 0 then
216216
Trace.log "No files need formatting"
217217
elif result.ExitCode = 99 then
218-
failwith "Some files need formatting, run `dotnet fake build -t Format` to format them"
218+
failwith
219+
"Some files need formatting, run `dotnet run --project build/build.fsproj -- -t Format` to format them"
219220
else
220221
Trace.logf "Errors while formatting: %A" result.Errors
221222
failwith "Unknown errors while formatting")

‎build/build.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
88
<Compile Include="build.fs" />
99
</ItemGroup>
1010
<Import Project="..\.paket\Paket.Restore.targets" />
11-
</Project>
11+
</Project>

‎paket.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ NUGET
2424
NETStandard.Library.NETFramework (2.0.0-preview2-25405-01)
2525
GITHUB
2626
remote: fsprojects/FSharp.TypeProviders.SDK
27-
src/ProvidedTypes.fs (dc8c662ca2e7d8d11048968ca166df6dc2fd9482)
28-
src/ProvidedTypes.fsi (dc8c662ca2e7d8d11048968ca166df6dc2fd9482)
29-
tests/ProvidedTypesTesting.fs (dc8c662ca2e7d8d11048968ca166df6dc2fd9482)
27+
src/ProvidedTypes.fs (23b588d06acb8e100402523abc1d4f3f06325b8a)
28+
src/ProvidedTypes.fsi (23b588d06acb8e100402523abc1d4f3f06325b8a)
29+
tests/ProvidedTypesTesting.fs (23b588d06acb8e100402523abc1d4f3f06325b8a)
3030
GROUP Fake
3131
STORAGE: NONE
3232
NUGET

‎src/AssemblyInfo.Csv.Core.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.Csv.Core")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.Csv.Core"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.DesignTime.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.DesignTime")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.DesignTime"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.Html.Core.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.Html.Core")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.Html.Core"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.Http.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.Http")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.Http"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.Json.Core.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.Json.Core")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.Json.Core"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.Runtime.Utilities.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.Runtime.Utilities")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.Runtime.Utilities"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.WorldBank.Core.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.WorldBank.Core")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.WorldBank.Core"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.Xml.Core.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data.Xml.Core")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data.Xml.Core"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎src/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Data")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Data")>]
77
[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
8-
[<assembly: AssemblyVersionAttribute("6.4.1.0")>]
9-
[<assembly: AssemblyFileVersionAttribute("6.4.1.0")>]
8+
[<assembly: AssemblyVersionAttribute("6.6.0.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("6.6.0.0")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Data"
1414
let [<Literal>] AssemblyProduct = "FSharp.Data"
1515
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
16-
let [<Literal>] AssemblyVersion = "6.4.1.0"
17-
let [<Literal>] AssemblyFileVersion = "6.4.1.0"
16+
let [<Literal>] AssemblyVersion = "6.6.0.0"
17+
let [<Literal>] AssemblyFileVersion = "6.6.0.0"

‎tests/FSharp.Data.Core.Tests/FSharp.Data.Core.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@
4747
<PackageReference Update="FSharp.Core" Version="6.0.1" />
4848
</ItemGroup>
4949
<Import Project="..\..\.paket\Paket.Restore.targets" />
50-
</Project>
50+
</Project>

‎tests/FSharp.Data.DesignTime.Tests/FSharp.Data.DesignTime.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
<ProjectReference Include="..\..\src\FSharp.Data.DesignTime\FSharp.Data.DesignTime.fsproj" />
2929
</ItemGroup>
3030
<Import Project="..\..\.paket\Paket.Restore.targets" />
31-
</Project>
31+
</Project>

‎tests/FSharp.Data.Reference.Tests/FSharp.Data.Reference.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
<ProjectReference Include="..\FSharp.Data.Tests\FSharp.Data.Tests.fsproj" />
2424
</ItemGroup>
2525
<Import Project="..\..\.paket\Paket.Restore.targets" />
26-
</Project>
26+
</Project>

‎tests/FSharp.Data.Tests/FSharp.Data.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636
<PackageReference Update="FSharp.Core" Version="6.0.1" />
3737
</ItemGroup>
3838
<Import Project="..\..\.paket\Paket.Restore.targets" />
39-
</Project>
39+
</Project>

0 commit comments

Comments
 (0)