Skip to content

Commit 03de84b

Browse files
xperiandrixperiandri
committed
Migrated to .NET 6 for server part
1 parent 9b4f91a commit 03de84b

File tree

9 files changed

+40
-25
lines changed

9 files changed

+40
-25
lines changed

‎Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<LangVersion>6.0</LangVersion>
6-
<!--<NoWarn>$(NoWarn)</NoWarn>-->
6+
<NoWarn>$(NoWarn);NU1504;NU1701</NoWarn>
77
<TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
88
</PropertyGroup>
99

@@ -23,7 +23,7 @@
2323
<IncludeSymbols>true</IncludeSymbols>
2424
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2525
<EmbedUntrackedSources>true</EmbedUntrackedSources>
26-
26+
2727
<MinVerTagPrefix>v</MinVerTagPrefix>
2828
</PropertyGroup>
2929
</Project>

‎Packages.props‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MicrosoftExtensionsVersion>6.0.*</MicrosoftExtensionsVersion>
55
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
6-
<XUnitVersion>2.*</XUnitVersion>
6+
<XUnitVersion>2.4.2</XUnitVersion>
77
</PropertyGroup>
88
<ItemGroup Label="Common">
99
<PackageReference Update="FParsec" Version="1.1.1" />
@@ -13,19 +13,37 @@
1313
</PackageReference>
1414
<PackageReference Update="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsVersion)" />
1515
<PackageReference Update="NuGet.CommandLine" Version="1.*" />
16+
<PackageReference Update="System.CodeDom" Version="6.*" />
17+
<PackageReference Update="System.Management" Version="6.*" />
1618
<PackageReference Update="System.Reactive" Version="5.*" />
1719
</ItemGroup>
20+
<ItemGroup Label="Test platform">
21+
<PackageReference Update="BenchmarkDotNet" Version="0.13.2" />
22+
<PackageReference Update="BenchmarkDotNet.Annotations" Version="0.*" />
23+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.*" />
24+
<PackageReference Update="Microsoft.TestPlatform.TestHost" Version="17.3.*" />
25+
<PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.3.*" />
26+
<PackageReference Update="xunit" Version="$(XUnitVersion)" />
27+
<PackageReference Update="xunit.analyzers" Version="1.*" />
28+
<PackageReference Update="xunit.assert" Version="$(XUnitVersion)" />
29+
<PackageReference Update="xunit.core" Version="$(XUnitVersion)" />
30+
<PackageReference Update="xunit.extensibility.core" Version="$(XUnitVersion)" />
31+
<PackageReference Update="xunit.extensibility.execution" Version="$(XUnitVersion)" />
32+
<PackageReference Update="xunit.runner.console" Version="$(XUnitVersion)" />
33+
<PackageReference Update="xunit.runner.utility" Version="$(XUnitVersion)" />
34+
<PackageReference Update="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
35+
</ItemGroup>
1836
<ItemGroup Label="Tests and Samples">
19-
<PackageReference Update="BenchmarkDotNet" Version="0.*" />
37+
<PackageReference Update="CommandLineParser" Version="2.9.*" />
2038
<PackageReference Update="EntityFramework" Version="1.*" />
2139
<PackageReference Update="FSharp.Data.TypeProviders" Version="1.*" />
2240
<PackageReference Update="Giraffe" Version="6.*" />
23-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.*" />
41+
<PackageReference Update="Iced" Version="1.17.*" />
42+
<PackageReference Update="Microsoft.CodeCoverage" Version="17.3.*" />
43+
<PackageReference Update="Microsoft.Diagnostics.NETCore.Client" Version="0.2.*" />
44+
<PackageReference Update="Microsoft.Diagnostics.Runtime" Version="2.2.*" />
45+
<PackageReference Update="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.*" />
46+
<PackageReference Update="Microsoft.NETCore.Platforms" Version="6.0.*" />
2447
<PackageReference Update="Newtonsoft.Json" Version="13.*" />
25-
<PackageReference Update="Suave" Version="2.*" />
26-
<PackageReference Update="xunit" Version="$(XUnitVersion)" />
27-
<PackageReference Update="xunit.runner.utility" Version="$(XUnitVersion)" />
28-
<PackageReference Update="xunit.runner.console" Version="$(XUnitVersion)" />
29-
<PackageReference Update="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
3048
</ItemGroup>
3149
</Project>

‎build.fsx.lock‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/FSharp.Data.GraphQL.Client/TextConversions.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------
22
// Copyright (c) Microsoft Corporation 2005-2012.
33
// This sample code is provided "as is" without warranty of any kind.
44
// We disclaim all warranties, either express or implied, including the
@@ -27,7 +27,7 @@ module private TextConversionHelpers =
2727

2828
let dateTimeStyles = DateTimeStyles.AllowWhiteSpaces ||| DateTimeStyles.RoundtripKind
2929

30-
let ParseISO8601FormattedDateTime text cultureInfo =
30+
let ParseISO8601FormattedDateTime (text : string) cultureInfo =
3131
match DateTime.TryParse(text, cultureInfo, dateTimeStyles) with
3232
| true, d -> d |> Some
3333
| false, _ -> None
@@ -82,7 +82,7 @@ type TextConversions private() =
8282
let min = (hourMin%100) |> float |> TimeSpan.FromMinutes
8383
hr.Add min
8484

85-
let offset str =
85+
let offset (str : string) =
8686
match Int32.TryParse str with
8787
| true, v -> getTimeSpanFromHourMin v |> Some
8888
| false, _ -> None
@@ -119,4 +119,4 @@ module internal UnicodeHelper =
119119
let LOW_TEN_BIT_MASK = 0x003FFu
120120
let leadSurrogate = (codePoint &&& HIGH_TEN_BIT_MASK >>> 10) + 0xD800u
121121
let trailSurrogate = (codePoint &&& LOW_TEN_BIT_MASK) + 0xDC00u
122-
char leadSurrogate, char trailSurrogate
122+
char leadSurrogate, char trailSurrogate

‎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-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<Deterministic>true</Deterministic>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,10 @@ let private executeSubscription (resultSet: (string * ExecutionInfo) []) (ctx: E
611611
Path = fieldPath |> List.rev }
612612
let onValue v = asyncVal {
613613
match! executeResolvers fieldCtx fieldPath value (toOption v |> AsyncVal.wrap) with
614-
| Ok (data, None, []) -> return NameValueLookup.ofList["data", box <| NameValueLookup.ofList [nameOrAlias, data.Value]] :> Output
615-
| Ok (data, None, errs) -> return NameValueLookup.ofList["data", box <| NameValueLookup.ofList [nameOrAlias, data.Value]; "errors", upcast errs] :> Output
614+
| Ok (data, None, []) -> return NameValueLookup.ofList ["data", box <| NameValueLookup.ofList [nameOrAlias, data.Value]] :> Output
615+
| Ok (data, None, errs) -> return NameValueLookup.ofList ["data", box <| NameValueLookup.ofList [nameOrAlias, data.Value]; "errors", upcast errs] :> Output
616616
| Ok (_, Some _, _) -> return failwithf "Deferred/Streamed/Live are not supported for subscriptions!"
617-
| Error errs -> return NameValueLookup.ofList["data", null; "errors", upcast errs] :> Output
617+
| Error errs -> return NameValueLookup.ofList ["data", null; "errors", upcast errs] :> Output
618618
}
619619
ctx.Schema.SubscriptionProvider.Add fieldCtx value subdef
620620
|> Observable.bind(onValue >> Observable.ofAsyncVal)

‎src/FSharp.Data.GraphQL.Server/FSharp.Data.GraphQL.Server.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-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Deterministic>true</Deterministic>
77

‎src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Deterministic>true</Deterministic>
77

@@ -29,6 +29,7 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="FParsec" />
32+
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Update="FSharp.Core" VersionOverride="4.7.2" />
3233
</ItemGroup>
3334

3435
<ItemGroup>

‎tests/FSharp.Data.GraphQL.IntegrationTests.Server/FSharp.Data.GraphQL.IntegrationTests.Server.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Giraffe" />
10+
<PackageReference Include="Microsoft.Extensions.Http" />
1011
</ItemGroup>
1112

1213
<ItemGroup>

0 commit comments

Comments
 (0)