From 0797b973fcd15d4594a222b224d6365ab1a196d2 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Wed, 12 Nov 2025 15:10:38 +1100 Subject: [PATCH] update to net10 --- docs/configuration.md | 2 +- src/Directory.Build.props | 2 +- src/Directory.Packages.props | 6 +++--- src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj | 2 +- src/SampleWeb.Tests/GraphQlControllerTests.cs | 2 ++ src/SampleWeb.Tests/SampleWeb.Tests.csproj | 2 +- src/SampleWeb/Program.cs | 3 ++- src/SampleWeb/SampleWeb.csproj | 2 +- src/Snippets/Snippets.csproj | 2 +- .../IntegrationTests.Connection_first_page.verified.txt | 6 +++--- .../IntegrationTests.Connection_page_back.verified.txt | 6 +++--- ...ationTests.Connection_parent_child_Filtered.verified.txt | 6 +++--- .../IntegrationTests.Root_connectionFiltered.verified.txt | 6 +++--- .../IntegrationTests/IntegrationTests.Skip.verified.txt | 4 ++-- .../IntegrationTests/IntegrationTests.Take.verified.txt | 6 +++--- src/Tests/Tests.csproj | 2 +- 16 files changed, 31 insertions(+), 28 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index e33e51b7d..24d62aa50 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -639,7 +639,7 @@ public class GraphQlControllerTests } } ``` -snippet source | anchor +snippet source | anchor diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e9716a3ec..7c0bf27d7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;NU5104;CS1573;CS9107;NU1608;NU1109 - 32.4.0-beta.1 + 33.0.0 preview 1.0.0 EntityFrameworkCore, EntityFramework, GraphQL diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index f72aa238f..b545cc200 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -5,7 +5,7 @@ - + @@ -19,11 +19,11 @@ - + - + diff --git a/src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj b/src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj index f76ab4ce2..2e7a10777 100644 --- a/src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj +++ b/src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 Add EntityFramework Core IQueryable support to GraphQL true diff --git a/src/SampleWeb.Tests/GraphQlControllerTests.cs b/src/SampleWeb.Tests/GraphQlControllerTests.cs index db7db99e3..00f1c5621 100644 --- a/src/SampleWeb.Tests/GraphQlControllerTests.cs +++ b/src/SampleWeb.Tests/GraphQlControllerTests.cs @@ -1,6 +1,8 @@ using System.Net; using Newtonsoft.Json; // ReSharper disable PrivateFieldCanBeConvertedToLocalVariable +#pragma warning disable ASPDEPR008 +#pragma warning disable ASPDEPR004 #region GraphQlControllerTests diff --git a/src/SampleWeb.Tests/SampleWeb.Tests.csproj b/src/SampleWeb.Tests/SampleWeb.Tests.csproj index 86162733f..a35473a38 100644 --- a/src/SampleWeb.Tests/SampleWeb.Tests.csproj +++ b/src/SampleWeb.Tests/SampleWeb.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 false Exe $(NoWarn);xUnit1051 diff --git a/src/SampleWeb/Program.cs b/src/SampleWeb/Program.cs index 76ab60667..edccb7d64 100644 --- a/src/SampleWeb/Program.cs +++ b/src/SampleWeb/Program.cs @@ -1,4 +1,5 @@ -public class Program +#pragma warning disable ASPDEPR008 +public class Program { public static Task Main() { diff --git a/src/SampleWeb/SampleWeb.csproj b/src/SampleWeb/SampleWeb.csproj index 2ccc58f4a..bb9255f33 100644 --- a/src/SampleWeb/SampleWeb.csproj +++ b/src/SampleWeb/SampleWeb.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 false diff --git a/src/Snippets/Snippets.csproj b/src/Snippets/Snippets.csproj index 22dc79392..2f4636b19 100644 --- a/src/Snippets/Snippets.csproj +++ b/src/Snippets/Snippets.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 Exe $(NoWarn);xUnit1051 diff --git a/src/Tests/IntegrationTests/IntegrationTests.Connection_first_page.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Connection_first_page.verified.txt index 9731776a1..39e890658 100644 --- a/src/Tests/IntegrationTests/IntegrationTests.Connection_first_page.verified.txt +++ b/src/Tests/IntegrationTests/IntegrationTests.Connection_first_page.verified.txt @@ -41,10 +41,10 @@ select p.Id, p.Property from ParentEntities as p order by p.Id -offset @__p_0 rows fetch next @__p_1 rows only, +offset @p rows fetch next @p0 rows only, Parameters: { - @__p_0: 1, - @__p_1: 2 + @p: 1, + @p0: 2 } } ] diff --git a/src/Tests/IntegrationTests/IntegrationTests.Connection_page_back.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Connection_page_back.verified.txt index 7bed5a4b2..c40d76639 100644 --- a/src/Tests/IntegrationTests/IntegrationTests.Connection_page_back.verified.txt +++ b/src/Tests/IntegrationTests/IntegrationTests.Connection_page_back.verified.txt @@ -41,10 +41,10 @@ select p.Id, p.Property from ParentEntities as p order by p.Id -offset @__p_0 rows fetch next @__p_1 rows only, +offset @p rows fetch next @p0 rows only, Parameters: { - @__p_0: 0, - @__p_1: 2 + @p: 0, + @p0: 2 } } ] diff --git a/src/Tests/IntegrationTests/IntegrationTests.Connection_parent_child_Filtered.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Connection_parent_child_Filtered.verified.txt index 1e4cf9579..91cfc39c4 100644 --- a/src/Tests/IntegrationTests/IntegrationTests.Connection_parent_child_Filtered.verified.txt +++ b/src/Tests/IntegrationTests/IntegrationTests.Connection_parent_child_Filtered.verified.txt @@ -47,14 +47,14 @@ from (select f.Id, f.Property from FilterParentEntities as f order by f.Id - offset @__p_0 rows fetch next @__p_1 rows only) as f1 + offset @p rows fetch next @p0 rows only) as f1 left outer join FilterChildEntities as f0 on f1.Id = f0.ParentId order by f1.Id, Parameters: { - @__p_0: 0, - @__p_1: 10 + @p: 0, + @p0: 10 } } ] diff --git a/src/Tests/IntegrationTests/IntegrationTests.Root_connectionFiltered.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Root_connectionFiltered.verified.txt index a420be971..728c33b43 100644 --- a/src/Tests/IntegrationTests/IntegrationTests.Root_connectionFiltered.verified.txt +++ b/src/Tests/IntegrationTests/IntegrationTests.Root_connectionFiltered.verified.txt @@ -32,10 +32,10 @@ select f.Id, f.Property from FilterParentEntities as f order by f.Id -offset @__p_0 rows fetch next @__p_1 rows only, +offset @p rows fetch next @p0 rows only, Parameters: { - @__p_0: 0, - @__p_1: 10 + @p: 0, + @p0: 10 } } ] diff --git a/src/Tests/IntegrationTests/IntegrationTests.Skip.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Skip.verified.txt index 0cd582a28..5026f9e35 100644 --- a/src/Tests/IntegrationTests/IntegrationTests.Skip.verified.txt +++ b/src/Tests/IntegrationTests/IntegrationTests.Skip.verified.txt @@ -15,9 +15,9 @@ select p.Id, p.Property from ParentEntities as p order by p.Property -offset @__p_0 rows, +offset @p rows, Parameters: { - @__p_0: 1 + @p: 1 } } } \ No newline at end of file diff --git a/src/Tests/IntegrationTests/IntegrationTests.Take.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Take.verified.txt index 6dde47c1d..ab66280ea 100644 --- a/src/Tests/IntegrationTests/IntegrationTests.Take.verified.txt +++ b/src/Tests/IntegrationTests/IntegrationTests.Take.verified.txt @@ -11,12 +11,12 @@ }, sql: { Text: -select top (@__p_0) p.Id, - p.Property +select top (@p) p.Id, + p.Property from ParentEntities as p order by p.Property, Parameters: { - @__p_0: 1 + @p: 1 } } } \ No newline at end of file diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index 326097c1c..ad74539ac 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 $(NoWarn);EF1000;xUnit1051 Exe testing