Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 21c12f2

Browse filesBrowse files
kevin-carrollkevin-carroll
committed
WIP, Updates for .NET 9 build targets
1 parent abbf21e commit 21c12f2
Copy full SHA for 21c12f2

File tree

19 files changed

+59
-46
lines changed
Filter options

19 files changed

+59
-46
lines changed

‎.github/workflows/ci-build.yml

Copy file name to clipboardExpand all lines: .github/workflows/ci-build.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
name: Install .NET
3838
with:
3939
dotnet-version: |
40-
6.x
4140
8.x
41+
9.x
4242
4343
# ---------------------------------------
4444
# Configure the build environment

‎.github/workflows/nuget-deployment.yml

Copy file name to clipboardExpand all lines: .github/workflows/nuget-deployment.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
name: Install .NET
4040
with:
4141
dotnet-version: |
42-
6.x
4342
8.x
43+
9.x
4444
4545
# ---------------------------------------
4646
# Configure the build environment

‎src/ancillary-projects/starwars/starwars-api80/Program.cs renamed to ‎src/ancillary-projects/starwars/starwars-api90/Program.cs

Copy file name to clipboard
File renamed without changes.

‎src/ancillary-projects/starwars/starwars-api80/Properties/launchSettings.json renamed to ‎src/ancillary-projects/starwars/starwars-api90/Properties/launchSettings.json

Copy file name to clipboard
File renamed without changes.

‎src/ancillary-projects/starwars/starwars-api80/appsettings.json renamed to ‎src/ancillary-projects/starwars/starwars-api90/appsettings.json

Copy file name to clipboard
File renamed without changes.

‎src/ancillary-projects/starwars/starwars-api80/starwars-api80.csproj renamed to ‎src/ancillary-projects/starwars/starwars-api90/starwars-api90.csproj

Copy file name to clipboardExpand all lines: src/ancillary-projects/starwars/starwars-api90/starwars-api90.csproj
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603</NoWarn>
77
<RootNamespace>GraphQL.AspNet.StarWarsAPI6X</RootNamespace>

‎src/ancillary-projects/starwars/starwars-common/starwars-common.csproj

Copy file name to clipboardExpand all lines: src/ancillary-projects/starwars/starwars-common/starwars-common.csproj
+1-1Lines 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>net8.0;net7.0;netstandard2.0;</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;netstandard2.0;</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603</NoWarn>
77
<RootNamespace>GraphQL.AspNet.StarwarsAPI.Common</RootNamespace>

‎src/graphql-aspnet-subscriptions/Web/WebSockets/WebSocketClientConnection.cs

Copy file name to clipboardExpand all lines: src/graphql-aspnet-subscriptions/Web/WebSockets/WebSocketClientConnection.cs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private string DeteremineRequestedProtocol()
5656
if (_httpContext.Request.Headers.ContainsKey(SubscriptionConstants.WebSockets.WEBSOCKET_PROTOCOL_HEADER))
5757
{
5858
var protocolHeaders = _httpContext.Request.Headers[SubscriptionConstants.WebSockets.WEBSOCKET_PROTOCOL_HEADER];
59-
return string.Join(",", protocolHeaders);
59+
return string.Join(",", protocolHeaders.ToArray());
6060
}
6161

6262
return string.Empty;

‎src/graphql-aspnet.sln

Copy file name to clipboardExpand all lines: src/graphql-aspnet.sln
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "graphql-aspnet-subscription
3333
EndProject
3434
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "graphql-aspnet-tests-common", "unit-tests\graphql-aspnet-tests-common\graphql-aspnet-tests-common.csproj", "{3CB086E3-5E7B-438B-9A95-AEA264009521}"
3535
EndProject
36-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "starwars-api80", "ancillary-projects\starwars\starwars-api80\starwars-api80.csproj", "{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}"
37-
EndProject
3836
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "graphql-aspnet-testframework-tests", "unit-tests\graphql-aspnet-testframework-tests\graphql-aspnet-testframework-tests.csproj", "{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}"
3937
EndProject
38+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "starwars-api90", "ancillary-projects\starwars\starwars-api90\starwars-api90.csproj", "{E7EE5851-57F1-4E20-B4BA-06902C77E83A}"
39+
EndProject
4040
Global
4141
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4242
Debug|Any CPU = Debug|Any CPU
@@ -72,14 +72,14 @@ Global
7272
{3CB086E3-5E7B-438B-9A95-AEA264009521}.Debug|Any CPU.Build.0 = Debug|Any CPU
7373
{3CB086E3-5E7B-438B-9A95-AEA264009521}.Release|Any CPU.ActiveCfg = Release|Any CPU
7474
{3CB086E3-5E7B-438B-9A95-AEA264009521}.Release|Any CPU.Build.0 = Release|Any CPU
75-
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Release|Any CPU.Build.0 = Release|Any CPU
7975
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8076
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
8177
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
8278
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Release|Any CPU.Build.0 = Release|Any CPU
79+
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Release|Any CPU.Build.0 = Release|Any CPU
8383
EndGlobalSection
8484
GlobalSection(SolutionProperties) = preSolution
8585
HideSolutionNode = FALSE
@@ -91,8 +91,8 @@ Global
9191
{5DE081AA-494A-4377-B2CA-6952715D513D} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
9292
{6E4A16F5-1B98-412E-9A88-F56301F5D0E4} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
9393
{3CB086E3-5E7B-438B-9A95-AEA264009521} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
94-
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114} = {22C7BC5B-EC8E-4A07-9968-961E86AB44E2}
9594
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
95+
{E7EE5851-57F1-4E20-B4BA-06902C77E83A} = {22C7BC5B-EC8E-4A07-9968-961E86AB44E2}
9696
EndGlobalSection
9797
GlobalSection(ExtensibilityGlobals) = postSolution
9898
SolutionGuid = {DD2C38B8-B029-4DE1-877E-B1A661AC412F}

‎src/graphql-aspnet.sln.DotSettings

Copy file name to clipboardExpand all lines: src/graphql-aspnet.sln.DotSettings
+8-1Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ graphql-aspnet&#xD;
246246
repo: https://github.com/kevin-carroll/graphql-aspnet&#xD;
247247
docs: -coming soon-&#xD;
248248
--&#xD;
249-
project: $PROJECT$&#xD;
249+
project: ${File.ProjectName}&#xD;
250250
--&#xD;
251251
License: MIT&#xD;
252252
*************************************************************</s:String>
@@ -265,6 +265,10 @@ License: MIT&#xD;
265265
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB"&gt;&lt;ExtraRule Prefix="ERROR_" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
266266
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
267267
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;</s:String>
268+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
269+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB"&gt;&lt;ExtraRule Prefix="ERROR_" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
270+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=669e5282_002Dfb4b_002D4e90_002D91e7_002D07d269d04b60/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB"&gt;&lt;ExtraRule Prefix="ERROR_" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
271+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"&gt;&lt;ElementKinds&gt;&lt;Kind Name="NAMESPACE" /&gt;&lt;Kind Name="CLASS" /&gt;&lt;Kind Name="STRUCT" /&gt;&lt;Kind Name="ENUM" /&gt;&lt;Kind Name="DELEGATE" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String>
268272
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
269273
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
270274
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -337,6 +341,7 @@ License: MIT&#xD;
337341
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchConflictResolutionMode/=VsBulb/@EntryIndexedValue">NOTIFY</s:String>
338342
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchConflictResolutionMode/=XAML_0020Designer/@EntryIndexedValue"></s:String>
339343
<s:Boolean x:Key="/Default/Environment/PerformanceGuide/SwitchConflictResolutionMode/=XAML_0020Designer/@EntryIndexRemoved">True</s:Boolean>
344+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
340345
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002EDaemon_002EInlayHints_002EParameterHints_002ECppParameterNameHintsOptionsOptionsMigration/@EntryIndexedValue">True</s:Boolean>
341346
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002EParameterNameHints_002ECSharpParameterNameHintsOptionsMigration/@EntryIndexedValue">True</s:Boolean>
342347
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EVB_002EParameterNameHints_002EVBParameterNameHintsOptionsMigration/@EntryIndexedValue">True</s:Boolean>
@@ -345,11 +350,13 @@ License: MIT&#xD;
345350
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
346351
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
347352
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
353+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
348354
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
349355
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
350356
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
351357
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
352358
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
359+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
353360
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>
354361

355362
<s:Int64 x:Key="/Default/Environment/UnitTesting/ParallelProcessesCount/@EntryValue">3</s:Int64>

‎src/graphql-aspnet/Execution/QueryPlans/DocumentParts/DocumentNamedFragmentCollection.cs

Copy file name to clipboardExpand all lines: src/graphql-aspnet/Execution/QueryPlans/DocumentParts/DocumentNamedFragmentCollection.cs
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ namespace GraphQL.AspNet.Execution.QueryPlans.DocumentParts
1313
using System.Collections.Generic;
1414
using System.Diagnostics;
1515
using GraphQL.AspNet.Common;
16-
using GraphQL.AspNet.Common.Generics;
1716
using GraphQL.AspNet.Interfaces.Execution.QueryPlans.DocumentParts;
1817

18+
using OrderedDictionaryOfStringAndNamedFragment = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Interfaces.Execution.QueryPlans.DocumentParts.INamedFragmentDocumentPart>;
19+
1920
/// <summary>
2021
/// An indexed collection of named fragments contained within a query document.
2122
/// </summary>
2223
[DebuggerDisplay("Count = {Count}")]
2324
internal class DocumentNamedFragmentCollection : INamedFragmentCollectionDocumentPart
2425
{
25-
private OrderedDictionary<string, INamedFragmentDocumentPart> _fragments;
26+
private OrderedDictionaryOfStringAndNamedFragment _fragments;
2627

2728
// its possible that a document declares more than one named fragment with the same
2829
// name. Keep track of the duplicates for document validation reporting.
@@ -35,7 +36,7 @@ internal class DocumentNamedFragmentCollection : INamedFragmentCollectionDocumen
3536
public DocumentNamedFragmentCollection(IDocumentPart parent)
3637
{
3738
this.Parent = Validation.ThrowIfNullOrReturn(parent, nameof(parent));
38-
_fragments = new OrderedDictionary<string, INamedFragmentDocumentPart>();
39+
_fragments = new OrderedDictionaryOfStringAndNamedFragment();
3940
}
4041

4142
/// <summary>

‎src/graphql-aspnet/Execution/Response/ResponseFieldSet.cs

Copy file name to clipboardExpand all lines: src/graphql-aspnet/Execution/Response/ResponseFieldSet.cs
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@ namespace GraphQL.AspNet.Execution.Response
1111
{
1212
using System.Collections.Generic;
1313
using System.Diagnostics;
14-
using GraphQL.AspNet.Common.Generics;
1514
using GraphQL.AspNet.Interfaces.Execution.Response;
1615

16+
using OrderedDictionaryOfStringAndQueryResponseItem = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Interfaces.Execution.Response.IQueryResponseItem>;
17+
1718
/// <summary>
1819
/// A collection of keyed items included as a result to a graphql query.
1920
/// </summary>
2021
[DebuggerDisplay("Count = {Fields.Count}")]
2122
internal class ResponseFieldSet : IQueryResponseFieldSet
2223
{
23-
private readonly OrderedDictionary<string, IQueryResponseItem> _dictionary;
24+
private readonly OrderedDictionaryOfStringAndQueryResponseItem _dictionary;
2425

2526
/// <summary>
2627
/// Initializes a new instance of the <see cref="ResponseFieldSet"/> class.
2728
/// </summary>
2829
public ResponseFieldSet()
2930
{
30-
_dictionary = new OrderedDictionary<string, IQueryResponseItem>();
31+
_dictionary = new OrderedDictionaryOfStringAndQueryResponseItem();
3132
}
3233

3334
/// <summary>

‎src/graphql-aspnet/Schemas/Structural/GraphFieldArgumentCollection.cs

Copy file name to clipboardExpand all lines: src/graphql-aspnet/Schemas/Structural/GraphFieldArgumentCollection.cs
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@ namespace GraphQL.AspNet.Schemas.Structural
1414
using System.Collections.Generic;
1515
using System.Diagnostics;
1616
using GraphQL.AspNet.Common;
17-
using GraphQL.AspNet.Common.Generics;
1817
using GraphQL.AspNet.Interfaces.Schema;
1918
using GraphQL.AspNet.Schemas.TypeSystem;
2019

20+
using OrderedDictionaryOfStringAndGraphArgument = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Interfaces.Schema.IGraphArgument>;
21+
2122
/// <summary>
2223
/// A collection of allowed arguments defined for a <see cref="IGraphField"/> or <see cref="IDirective"/>.
2324
/// </summary>
2425
[DebuggerDisplay("Count = {Count}")]
2526
internal class GraphFieldArgumentCollection : IGraphArgumentCollection
2627
{
2728
private readonly ISchemaItem _owner;
28-
private readonly OrderedDictionary<string, IGraphArgument> _arguments;
29+
private readonly OrderedDictionaryOfStringAndGraphArgument _arguments;
2930
private IGraphArgument _sourceArgument;
3031

3132
/// <summary>
@@ -36,7 +37,7 @@ internal class GraphFieldArgumentCollection : IGraphArgumentCollection
3637
public GraphFieldArgumentCollection(ISchemaItem owner)
3738
{
3839
_owner = Validation.ThrowIfNullOrReturn(owner, nameof(owner));
39-
_arguments = new OrderedDictionary<string, IGraphArgument>(StringComparer.Ordinal);
40+
_arguments = new OrderedDictionaryOfStringAndGraphArgument(StringComparer.Ordinal);
4041
}
4142

4243
/// <inheritdoc />

‎src/graphql-aspnet/Schemas/TypeSystem/Introspection/Model/IntrospectedSchema.cs

Copy file name to clipboardExpand all lines: src/graphql-aspnet/Schemas/TypeSystem/Introspection/Model/IntrospectedSchema.cs
+5-4Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@ namespace GraphQL.AspNet.Schemas.TypeSystem.Introspection.Model
1616
using GraphQL.AspNet.Attributes;
1717
using GraphQL.AspNet.Common;
1818
using GraphQL.AspNet.Common.Extensions;
19-
using GraphQL.AspNet.Common.Generics;
2019
using GraphQL.AspNet.Execution.Exceptions;
2120
using GraphQL.AspNet.Interfaces.Schema;
2221
using GraphQL.AspNet.Schemas.TypeSystem;
2322

23+
using OrderedDictionaryOfStringAndType = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Schemas.TypeSystem.Introspection.Model.IntrospectedType>;
24+
2425
/// <summary>
2526
/// A model object containing data for the '__Schema' type.
2627
/// </summary>
2728
[DebuggerDisplay("Introspected Schema: {Name}")]
2829
public sealed class IntrospectedSchema : IntrospectedItem, ISchemaItem
2930
{
3031
private readonly ISchema _schema;
31-
private OrderedDictionary<string, IntrospectedType> _typeList;
32+
private OrderedDictionaryOfStringAndType _typeList;
3233
private List<IntrospectedDirective> _directiveList;
3334

3435
/// <summary>
@@ -39,7 +40,7 @@ public IntrospectedSchema(ISchema schema)
3940
: base(schema)
4041
{
4142
_schema = Validation.ThrowIfNullOrReturn(schema, nameof(schema));
42-
_typeList = new OrderedDictionary<string, IntrospectedType>();
43+
_typeList = new OrderedDictionaryOfStringAndType();
4344
}
4445

4546
/// <summary>
@@ -72,7 +73,7 @@ private void RebuildDirectiveList()
7273
private void RebuildIntrospectedTypeList()
7374
{
7475
_typeList.Clear();
75-
_typeList = new OrderedDictionary<string, IntrospectedType>();
76+
_typeList = new OrderedDictionaryOfStringAndType();
7677

7778
// build in a two pass approach
7879
// -----------------------------------------

‎src/library-common.props

Copy file name to clipboardExpand all lines: src/library-common.props
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Common property settings for 1st-party production libraries -->
22
<Project>
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net6.0;netstandard2.0;</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;netstandard2.0;</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603;IDE0019;IDE0017;RCS1146;RCS1194;</NoWarn>
77

‎src/library-tests.props

Copy file name to clipboardExpand all lines: src/library-tests.props
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Common property settings for 1st-party production libraries -->
22
<Project>
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603;IDE0019;IDE0017;RCS1146;RCS1194;</NoWarn>
77
<RootNamespace>GraphQL.AspNet.Tests</RootNamespace>

‎src/unit-tests/graphql-aspnet-testframework/graphql-aspnet-testframework.csproj

Copy file name to clipboardExpand all lines: src/unit-tests/graphql-aspnet-testframework/graphql-aspnet-testframework.csproj
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\library-common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
66
<RootNamespace>GraphQL.AspNet.Tests.Framework</RootNamespace>
77
<AssemblyName>GraphQL.AspNet.TestFramework</AssemblyName>
88
<Title>GraphQL ASP.NET Test Framework</Title>

‎src/unit-tests/graphql-aspnet-tests-thirdpartydll/graphql-aspnet-tests-thirdpartydll.csproj

Copy file name to clipboardExpand all lines: src/unit-tests/graphql-aspnet-tests-thirdpartydll/graphql-aspnet-tests-thirdpartydll.csproj
+1-1Lines 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>net8.0;net7.0;net6.0;</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603;IDE0060;IDE0052;IDE0044;IDE0059;IDE0052</NoWarn>
77
<RootNamespace>GraphQL.AspNet.Tests.ThirdPartyDll</RootNamespace>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.