Skip to content

Commit 4a3d1a3

Browse files
xperiandrixperiandri
committed
Migrated to .NET 8 and updated all NuGet packages
1 parent 4392616 commit 4a3d1a3

File tree

17 files changed

+36
-40
lines changed

17 files changed

+36
-40
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22

33
<PropertyGroup>
4-
<PackageTargetFrameworks>net6.0;net7.0</PackageTargetFrameworks>
5-
<LangVersion>7.0</LangVersion>
6-
<FSharpCoreVersion>7.0.*</FSharpCoreVersion>
4+
<DotNetVersion>net8.0</DotNetVersion>
5+
<LangVersion>8.0</LangVersion>
6+
<FSharpCoreVersion>8.0.*</FSharpCoreVersion>
77
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
88
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
99
<NoWarn>$(NoWarn);NU1504;NU1701</NoWarn>
@@ -18,7 +18,7 @@
1818
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))</RepoRoot>
1919
<RepositoryUrl>https://github.com/fsprojects/FSharp.Data.GraphQL</RepositoryUrl>
2020
<RepositoryType>git</RepositoryType>
21-
<Version>2.0.0</Version>
21+
<Version>3.0.0</Version>
2222
<PackageTags>FSharp GraphQL Relay React Middleware</PackageTags>
2323
<PackageReadmeFile>README.md</PackageReadmeFile>
2424
<PackageIcon>icon.png</PackageIcon>

‎FSharp.Data.GraphQL.Integration.sln‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.5.33312.197
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D52DCCB-1899-47FB-9F7A-1571E444B4CE}"
77
ProjectSection(SolutionItems) = preProject
8+
Directory.Build.props = Directory.Build.props
9+
Directory.Build.targets = Directory.Build.targets
810
Packages.props = Packages.props
911
EndProjectSection
1012
EndProject
@@ -56,18 +58,6 @@ Global
5658
{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x64.Build.0 = Release|Any CPU
5759
{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x86.ActiveCfg = Release|Any CPU
5860
{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x86.Build.0 = Release|Any CPU
59-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
61-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x64.ActiveCfg = Debug|Any CPU
62-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x64.Build.0 = Debug|Any CPU
63-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x86.ActiveCfg = Debug|Any CPU
64-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x86.Build.0 = Debug|Any CPU
65-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
66-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|Any CPU.Build.0 = Release|Any CPU
67-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x64.ActiveCfg = Release|Any CPU
68-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x64.Build.0 = Release|Any CPU
69-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x86.ActiveCfg = Release|Any CPU
70-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x86.Build.0 = Release|Any CPU
7161
{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7262
{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|Any CPU.Build.0 = Debug|Any CPU
7363
{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -80,6 +70,18 @@ Global
8070
{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x64.Build.0 = Release|Any CPU
8171
{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x86.ActiveCfg = Release|Any CPU
8272
{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x86.Build.0 = Release|Any CPU
73+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x64.ActiveCfg = Debug|Any CPU
76+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x64.Build.0 = Debug|Any CPU
77+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x86.ActiveCfg = Debug|Any CPU
78+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x86.Build.0 = Debug|Any CPU
79+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x64.ActiveCfg = Release|Any CPU
82+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x64.Build.0 = Release|Any CPU
83+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x86.ActiveCfg = Release|Any CPU
84+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x86.Build.0 = Release|Any CPU
8385
{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8486
{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
8587
{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -99,8 +101,8 @@ Global
99101
GlobalSection(NestedProjects) = preSolution
100102
{E6754A20-FA5E-4C76-AB1B-D35DF9526889} = {BA7F22E2-D411-4229-826B-F55FF171D12A}
101103
{09D910E6-94EF-46AF-94DF-10A9FEC837C0} = {BA7F22E2-D411-4229-826B-F55FF171D12A}
102-
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
103104
{237F9575-6E65-40DD-A77B-BA2882BD5646} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
105+
{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
104106
{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
105107
EndGlobalSection
106108
GlobalSection(ExtensibilityGlobals) = postSolution

‎Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<SystemVersion>7.0.*</SystemVersion>
5-
<MicrosoftExtensionsVersion>7.0.*</MicrosoftExtensionsVersion>
6-
<AspNetCoreVersion>7.0.*</AspNetCoreVersion>
4+
<SystemVersion>8.0.*</SystemVersion>
5+
<MicrosoftExtensionsVersion>8.0.*</MicrosoftExtensionsVersion>
6+
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
77
<FsToolkitVersion>4.15.*</FsToolkitVersion>
88
<XUnitVersion>2.8.1</XUnitVersion>
99
<FAKEVersion>6.*</FAKEVersion>

‎build/Build.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>$(DotNetVersion)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎samples/chat-app/server/FSharp.Data.GraphQL.Samples.ChatApp.fsproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<RootNamespace>FSharp.Data.GraphQL.Samples.ChatApp</RootNamespace>
4+
<TargetFramework>$(DotNetVersion)</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>

‎samples/star-wars-api/FSharp.Data.GraphQL.Samples.StarWarsApi.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
4+
<TargetFramework>$(DotNetVersion)</TargetFramework>
75
</PropertyGroup>
86

97
<ItemGroup Label="PackageReferences">

‎src/FSharp.Data.GraphQL.Server.AspNetCore/FSharp.Data.GraphQL.Server.AspNetCore.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(PackageTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Deterministic>true</Deterministic>
77
<Description>FSharp implementation of Facebook GraphQL query language (Application Infrastructure)</Description>

‎src/FSharp.Data.GraphQL.Server.Middleware/FSharp.Data.GraphQL.Server.Middleware.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(PackageTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
55
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

‎src/FSharp.Data.GraphQL.Server.Relay/FSharp.Data.GraphQL.Server.Relay.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(PackageTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

‎src/FSharp.Data.GraphQL.Server/Exceptions.fs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ type GraphQLException =
1414

1515
new () = { inherit Exception () }
1616
new (msg) = { inherit Exception (msg) }
17-
new (info : Runtime.Serialization.SerializationInfo, context : Runtime.Serialization.StreamingContext) = { inherit Exception (info, context) }
1817

1918
[<AbstractClass>]
2019
type GQLMessageExceptionBase (errorKind, msg, [<Optional>] extensions) =

0 commit comments

Comments
 (0)