Skip to content

Commit

Permalink
Update to Net 9 and related nugets (#1043)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp authored Nov 21, 2024
1 parent b7e23ef commit 1caf135
Show file tree
Hide file tree
Showing 20 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;NU5104;CS1573;CS9107</NoWarn>
<Version>27.2.2</Version>
<Version>28.0.0</Version>
<LangVersion>preview</LangVersion>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
Expand Down
10 changes: 5 additions & 5 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
<PackageVersion Include="EfLocalDb" Version="19.2.1" />
<PackageVersion Include="EfLocalDb" Version="20.0.0" />
<PackageVersion Include="Fody" Version="6.9.1" />
<PackageVersion Include="graphiql" Version="2.0.0" />
<PackageVersion Include="GraphQL" Version="8.2.1" />
<PackageVersion Include="GraphQL.MicrosoftDI" Version="8.2.1" />
<PackageVersion Include="GraphQL.SystemTextJson" Version="8.2.1" />
<PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Polyfill" Version="7.5.0" />
<PackageVersion Include="ProjectDefaults" Version="1.0.144" />
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
<PackageVersion Include="Verify.SqlServer" Version="10.1.0" />
<PackageVersion Include="Verify.XunitV3" Version="28.3.2" />
<PackageVersion Include="xunit.v3" Version="0.6.0-pre.7" />
Expand Down
2 changes: 1 addition & 1 deletion src/GraphQL.EntityFramework/GraphQL.EntityFramework.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Description>Add EntityFramework Core IQueryable support to GraphQL</Description>
<PolyNullability>true</PolyNullability>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SampleWeb.Tests/SampleWeb.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<SignAssembly>false</SignAssembly>
<OutputType>Exe</OutputType>
<NoWarn>xUnit1051</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion src/SampleWeb/SampleWeb.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Snippets/Snippets.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<NoWarn>xUnit1051</NoWarn>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(1) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(1) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(1) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(1) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
},
sql: {
Text:
SELECT [m].[Id], [m].[RightName], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId], [t].[Id], [t].[LeftName]
SELECT [m].[Id], [m].[RightName], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId], [s].[Id], [s].[LeftName]
FROM [ManyToManyRightEntities] AS [m]
LEFT JOIN (
SELECT [m2].[ManyToManyLeftEntityId], [m2].[ManyToManyRightEntityId], [m3].[Id], [m3].[LeftName]
FROM [ManyToManyMiddleEntities] AS [m2]
INNER JOIN [ManyToManyLeftEntities] AS [m3] ON [m2].[ManyToManyLeftEntityId] = [m3].[Id]
) AS [t] ON [m].[Id] = [t].[ManyToManyRightEntityId]
) AS [s] ON [m].[Id] = [s].[ManyToManyRightEntityId]
WHERE EXISTS (
SELECT 1
FROM [ManyToManyMiddleEntities] AS [m0]
INNER JOIN [ManyToManyLeftEntities] AS [m1] ON [m0].[ManyToManyLeftEntityId] = [m1].[Id]
WHERE [m].[Id] = [m0].[ManyToManyRightEntityId] AND [m1].[LeftName] = N'Left2')
ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId],
ORDER BY [m].[Id], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
},
sql: {
Text:
SELECT [m].[Id], [m].[RightName], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId], [t].[Id], [t].[LeftName]
SELECT [m].[Id], [m].[RightName], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId], [s].[Id], [s].[LeftName]
FROM [ManyToManyRightEntities] AS [m]
LEFT JOIN (
SELECT [m2].[ManyToManyLeftEntityId], [m2].[ManyToManyRightEntityId], [m3].[Id], [m3].[LeftName]
FROM [ManyToManyMiddleEntities] AS [m2]
INNER JOIN [ManyToManyLeftEntities] AS [m3] ON [m2].[ManyToManyLeftEntityId] = [m3].[Id]
) AS [t] ON [m].[Id] = [t].[ManyToManyRightEntityId]
) AS [s] ON [m].[Id] = [s].[ManyToManyRightEntityId]
WHERE EXISTS (
SELECT 1
FROM [ManyToManyMiddleEntities] AS [m0]
INNER JOIN [ManyToManyLeftEntities] AS [m1] ON [m0].[ManyToManyLeftEntityId] = [m1].[Id]
WHERE [m].[Id] = [m0].[ManyToManyRightEntityId] AND ([m1].[LeftName] <> N'Left2' OR [m1].[LeftName] IS NULL))
ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId],
ORDER BY [m].[Id], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
},
sql: {
Text:
SELECT [m].[Id], [m].[LeftName], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId], [t].[Id], [t].[RightName]
SELECT [m].[Id], [m].[LeftName], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId], [s].[Id], [s].[RightName]
FROM [ManyToManyLeftEntities] AS [m]
LEFT JOIN (
SELECT [m2].[ManyToManyLeftEntityId], [m2].[ManyToManyRightEntityId], [m3].[Id], [m3].[RightName]
FROM [ManyToManyMiddleEntities] AS [m2]
INNER JOIN [ManyToManyRightEntities] AS [m3] ON [m2].[ManyToManyRightEntityId] = [m3].[Id]
) AS [t] ON [m].[Id] = [t].[ManyToManyLeftEntityId]
) AS [s] ON [m].[Id] = [s].[ManyToManyLeftEntityId]
WHERE EXISTS (
SELECT 1
FROM [ManyToManyMiddleEntities] AS [m0]
INNER JOIN [ManyToManyRightEntities] AS [m1] ON [m0].[ManyToManyRightEntityId] = [m1].[Id]
WHERE [m].[Id] = [m0].[ManyToManyLeftEntityId] AND [m1].[RightName] = N'Right2')
ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId],
ORDER BY [m].[Id], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
},
sql: {
Text:
SELECT [m].[Id], [m].[LeftName], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId], [t].[Id], [t].[RightName]
SELECT [m].[Id], [m].[LeftName], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId], [s].[Id], [s].[RightName]
FROM [ManyToManyLeftEntities] AS [m]
LEFT JOIN (
SELECT [m2].[ManyToManyLeftEntityId], [m2].[ManyToManyRightEntityId], [m3].[Id], [m3].[RightName]
FROM [ManyToManyMiddleEntities] AS [m2]
INNER JOIN [ManyToManyRightEntities] AS [m3] ON [m2].[ManyToManyRightEntityId] = [m3].[Id]
) AS [t] ON [m].[Id] = [t].[ManyToManyLeftEntityId]
) AS [s] ON [m].[Id] = [s].[ManyToManyLeftEntityId]
WHERE EXISTS (
SELECT 1
FROM [ManyToManyMiddleEntities] AS [m0]
INNER JOIN [ManyToManyRightEntities] AS [m1] ON [m0].[ManyToManyRightEntityId] = [m1].[Id]
WHERE [m].[Id] = [m0].[ManyToManyLeftEntityId] AND ([m1].[RightName] <> N'Right2' OR [m1].[RightName] IS NULL))
ORDER BY [m].[Id], [t].[ManyToManyLeftEntityId], [t].[ManyToManyRightEntityId],
ORDER BY [m].[Id], [s].[ManyToManyLeftEntityId], [s].[ManyToManyRightEntityId],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(2) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(2) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
sql: [
{
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(2) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(2) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
sql: {
Text:
SELECT [t].[Id], [t].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
SELECT [p0].[Id], [p0].[Property], [c].[Id], [c].[Nullable], [c].[ParentId], [c].[Property]
FROM (
SELECT TOP(2) [p].[Id], [p].[Property]
FROM [ParentEntities] AS [p]
WHERE [p].[Id] = 'Guid_1'
) AS [t]
LEFT JOIN [ChildEntities] AS [c] ON [t].[Id] = [c].[ParentId]
ORDER BY [t].[Id],
) AS [p0]
LEFT JOIN [ChildEntities] AS [c] ON [p0].[Id] = [c].[ParentId]
ORDER BY [p0].[Id],
HasTransaction: false
}
}
2 changes: 1 addition & 1 deletion src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<NoWarn>$(NoWarn);EF1000;xUnit1051</NoWarn>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down

0 comments on commit 1caf135

Please sign in to comment.