Skip to content

.NET 9 build targets #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2025
Merged

.NET 9 build targets #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
name: Install .NET
with:
dotnet-version: |
6.x
8.x
9.x

# ---------------------------------------
# Configure the build environment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
name: Install .NET
with:
dotnet-version: |
6.x
8.x
9.x

# ---------------------------------------
# Configure the build environment
Expand Down
0 ...ojects/starwars/starwars-api80/Program.cs → ...ojects/starwars/starwars-api90/Program.cs
View file
Open in desktop
File renamed without changes.
0 ...wars-api80/Properties/launchSettings.json → ...wars-api90/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
0 .../starwars/starwars-api80/appsettings.json → .../starwars/starwars-api90/appsettings.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...wars/starwars-api80/starwars-api80.csproj → ...wars/starwars-api90/starwars-api90.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603</NoWarn>
<RootNamespace>GraphQL.AspNet.StarWarsAPI6X</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/ancillary-projects/starwars/starwars-common/starwars-common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;netstandard2.0;</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;netstandard2.0;</TargetFrameworks>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603</NoWarn>
<RootNamespace>GraphQL.AspNet.StarwarsAPI.Common</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/graphql-aspnet-subscriptions/Web/WebSockets/WebSocketClientConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private string DeteremineRequestedProtocol()
if (_httpContext.Request.Headers.ContainsKey(SubscriptionConstants.WebSockets.WEBSOCKET_PROTOCOL_HEADER))
{
var protocolHeaders = _httpContext.Request.Headers[SubscriptionConstants.WebSockets.WEBSOCKET_PROTOCOL_HEADER];
return string.Join(",", protocolHeaders);
return string.Join(",", protocolHeaders.ToArray());
}

return string.Empty;
Expand Down
14 changes: 7 additions & 7 deletions src/graphql-aspnet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "graphql-aspnet-subscription
EndProject
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "starwars-api80", "ancillary-projects\starwars\starwars-api80\starwars-api80.csproj", "{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}"
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "starwars-api90", "ancillary-projects\starwars\starwars-api90\starwars-api90.csproj", "{E7EE5851-57F1-4E20-B4BA-06902C77E83A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -72,14 +72,14 @@ Global
{3CB086E3-5E7B-438B-9A95-AEA264009521}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3CB086E3-5E7B-438B-9A95-AEA264009521}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3CB086E3-5E7B-438B-9A95-AEA264009521}.Release|Any CPU.Build.0 = Release|Any CPU
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114}.Release|Any CPU.Build.0 = Release|Any CPU
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA}.Release|Any CPU.Build.0 = Release|Any CPU
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7EE5851-57F1-4E20-B4BA-06902C77E83A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -91,8 +91,8 @@ Global
{5DE081AA-494A-4377-B2CA-6952715D513D} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
{6E4A16F5-1B98-412E-9A88-F56301F5D0E4} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
{3CB086E3-5E7B-438B-9A95-AEA264009521} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
{43C9EB6E-5FFE-4EC6-B21B-09C715B7B114} = {22C7BC5B-EC8E-4A07-9968-961E86AB44E2}
{E67D4FB2-73FF-4EC1-80F8-5D4DEC57F5AA} = {350D3594-5D97-4D9B-A01D-D3A5C036318C}
{E7EE5851-57F1-4E20-B4BA-06902C77E83A} = {22C7BC5B-EC8E-4A07-9968-961E86AB44E2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DD2C38B8-B029-4DE1-877E-B1A661AC412F}
Expand Down
9 changes: 8 additions & 1 deletion src/graphql-aspnet.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ graphql-aspnet&#xD;
repo: https://github.com/kevin-carroll/graphql-aspnet&#xD;
docs: -coming soon-&#xD;
--&#xD;
project: $PROJECT$&#xD;
project: ${File.ProjectName}&#xD;
--&#xD;
License: MIT&#xD;
*************************************************************</s:String>
Expand All @@ -265,6 +265,10 @@ License: MIT&#xD;
<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>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;</s:String>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
Expand Down Expand Up @@ -337,6 +341,7 @@ License: MIT&#xD;
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchConflictResolutionMode/=VsBulb/@EntryIndexedValue">NOTIFY</s:String>
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchConflictResolutionMode/=XAML_0020Designer/@EntryIndexedValue"></s:String>
<s:Boolean x:Key="/Default/Environment/PerformanceGuide/SwitchConflictResolutionMode/=XAML_0020Designer/@EntryIndexRemoved">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002EDaemon_002EInlayHints_002EParameterHints_002ECppParameterNameHintsOptionsOptionsMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002EParameterNameHints_002ECSharpParameterNameHintsOptionsMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EVB_002EParameterNameHints_002EVBParameterNameHintsOptionsMigration/@EntryIndexedValue">True</s:Boolean>
Expand All @@ -345,11 +350,13 @@ License: MIT&#xD;
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>

<s:Int64 x:Key="/Default/Environment/UnitTesting/ParallelProcessesCount/@EntryValue">3</s:Int64>
Expand Down
7 changes: 4 additions & 3 deletions src/graphql-aspnet/Execution/QueryPlans/DocumentParts/DocumentNamedFragmentCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ namespace GraphQL.AspNet.Execution.QueryPlans.DocumentParts
using System.Collections.Generic;
using System.Diagnostics;
using GraphQL.AspNet.Common;
using GraphQL.AspNet.Common.Generics;
using GraphQL.AspNet.Interfaces.Execution.QueryPlans.DocumentParts;

using OrderedDictionaryOfStringAndNamedFragment = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Interfaces.Execution.QueryPlans.DocumentParts.INamedFragmentDocumentPart>;

/// <summary>
/// An indexed collection of named fragments contained within a query document.
/// </summary>
[DebuggerDisplay("Count = {Count}")]
internal class DocumentNamedFragmentCollection : INamedFragmentCollectionDocumentPart
{
private OrderedDictionary<string, INamedFragmentDocumentPart> _fragments;
private OrderedDictionaryOfStringAndNamedFragment _fragments;

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

/// <summary>
Expand Down
7 changes: 4 additions & 3 deletions src/graphql-aspnet/Execution/Response/ResponseFieldSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,24 @@ namespace GraphQL.AspNet.Execution.Response
{
using System.Collections.Generic;
using System.Diagnostics;
using GraphQL.AspNet.Common.Generics;
using GraphQL.AspNet.Interfaces.Execution.Response;

using OrderedDictionaryOfStringAndQueryResponseItem = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Interfaces.Execution.Response.IQueryResponseItem>;

/// <summary>
/// A collection of keyed items included as a result to a graphql query.
/// </summary>
[DebuggerDisplay("Count = {Fields.Count}")]
internal class ResponseFieldSet : IQueryResponseFieldSet
{
private readonly OrderedDictionary<string, IQueryResponseItem> _dictionary;
private readonly OrderedDictionaryOfStringAndQueryResponseItem _dictionary;

/// <summary>
/// Initializes a new instance of the <see cref="ResponseFieldSet"/> class.
/// </summary>
public ResponseFieldSet()
{
_dictionary = new OrderedDictionary<string, IQueryResponseItem>();
_dictionary = new OrderedDictionaryOfStringAndQueryResponseItem();
}

/// <summary>
Expand Down
7 changes: 4 additions & 3 deletions src/graphql-aspnet/Schemas/Structural/GraphFieldArgumentCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@ namespace GraphQL.AspNet.Schemas.Structural
using System.Collections.Generic;
using System.Diagnostics;
using GraphQL.AspNet.Common;
using GraphQL.AspNet.Common.Generics;
using GraphQL.AspNet.Interfaces.Schema;
using GraphQL.AspNet.Schemas.TypeSystem;

using OrderedDictionaryOfStringAndGraphArgument = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Interfaces.Schema.IGraphArgument>;

/// <summary>
/// A collection of allowed arguments defined for a <see cref="IGraphField"/> or <see cref="IDirective"/>.
/// </summary>
[DebuggerDisplay("Count = {Count}")]
internal class GraphFieldArgumentCollection : IGraphArgumentCollection
{
private readonly ISchemaItem _owner;
private readonly OrderedDictionary<string, IGraphArgument> _arguments;
private readonly OrderedDictionaryOfStringAndGraphArgument _arguments;
private IGraphArgument _sourceArgument;

/// <summary>
Expand All @@ -36,7 +37,7 @@ internal class GraphFieldArgumentCollection : IGraphArgumentCollection
public GraphFieldArgumentCollection(ISchemaItem owner)
{
_owner = Validation.ThrowIfNullOrReturn(owner, nameof(owner));
_arguments = new OrderedDictionary<string, IGraphArgument>(StringComparer.Ordinal);
_arguments = new OrderedDictionaryOfStringAndGraphArgument(StringComparer.Ordinal);
}

/// <inheritdoc />
Expand Down
9 changes: 5 additions & 4 deletions src/graphql-aspnet/Schemas/TypeSystem/Introspection/Model/IntrospectedSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@ namespace GraphQL.AspNet.Schemas.TypeSystem.Introspection.Model
using GraphQL.AspNet.Attributes;
using GraphQL.AspNet.Common;
using GraphQL.AspNet.Common.Extensions;
using GraphQL.AspNet.Common.Generics;
using GraphQL.AspNet.Execution.Exceptions;
using GraphQL.AspNet.Interfaces.Schema;
using GraphQL.AspNet.Schemas.TypeSystem;

using OrderedDictionaryOfStringAndType = GraphQL.AspNet.Common.Generics.OrderedDictionary<string, GraphQL.AspNet.Schemas.TypeSystem.Introspection.Model.IntrospectedType>;

/// <summary>
/// A model object containing data for the '__Schema' type.
/// </summary>
[DebuggerDisplay("Introspected Schema: {Name}")]
public sealed class IntrospectedSchema : IntrospectedItem, ISchemaItem
{
private readonly ISchema _schema;
private OrderedDictionary<string, IntrospectedType> _typeList;
private OrderedDictionaryOfStringAndType _typeList;
private List<IntrospectedDirective> _directiveList;

/// <summary>
Expand All @@ -39,7 +40,7 @@ public IntrospectedSchema(ISchema schema)
: base(schema)
{
_schema = Validation.ThrowIfNullOrReturn(schema, nameof(schema));
_typeList = new OrderedDictionary<string, IntrospectedType>();
_typeList = new OrderedDictionaryOfStringAndType();
}

/// <summary>
Expand Down Expand Up @@ -72,7 +73,7 @@ private void RebuildDirectiveList()
private void RebuildIntrospectedTypeList()
{
_typeList.Clear();
_typeList = new OrderedDictionary<string, IntrospectedType>();
_typeList = new OrderedDictionaryOfStringAndType();

// build in a two pass approach
// -----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/library-common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Common property settings for 1st-party production libraries -->
<Project>
<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.0;</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;netstandard2.0;</TargetFrameworks>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603;IDE0019;IDE0017;RCS1146;RCS1194;</NoWarn>

Expand Down
2 changes: 1 addition & 1 deletion src/library-tests.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Common property settings for 1st-party production libraries -->
<Project>
<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603;IDE0019;IDE0017;RCS1146;RCS1194;</NoWarn>
<RootNamespace>GraphQL.AspNet.Tests</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/unit-tests/graphql-aspnet-testframework/graphql-aspnet-testframework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\library-common.props" />

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<RootNamespace>GraphQL.AspNet.Tests.Framework</RootNamespace>
<AssemblyName>GraphQL.AspNet.TestFramework</AssemblyName>
<Title>GraphQL ASP.NET Test Framework</Title>
Expand Down
2 changes: 1 addition & 1 deletion src/unit-tests/graphql-aspnet-tests-thirdpartydll/graphql-aspnet-tests-thirdpartydll.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1701;1702;1705;1591;NU1603;IDE0060;IDE0052;IDE0044;IDE0059;IDE0052</NoWarn>
<RootNamespace>GraphQL.AspNet.Tests.ThirdPartyDll</RootNamespace>
Expand Down
Loading