Update Microsoft.AspNetCore.OData package reference to support v 9.2.1

xavierjohn · xavierjohn · commit bda72af583f7 · 2025-04-11T10:41:20.000-07:00
diff --git a/examples/AspNetCore/OData/ODataAdvancedExample/ODataAdvancedExample.csproj b/examples/AspNetCore/OData/ODataAdvancedExample/ODataAdvancedExample.csproj
@@ -4,4 +4,8 @@
   <ProjectReference Include="..\..\..\..\src\AspNetCore\OData\src\Asp.Versioning.OData\Asp.Versioning.OData.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+   <PackageReference Update="Microsoft.AspNetCore.OData" Version="9.2.1" />
+ </ItemGroup>
+
 </Project>
diff --git a/examples/AspNetCore/OData/ODataBasicExample/ODataBasicExample.csproj b/examples/AspNetCore/OData/ODataBasicExample/ODataBasicExample.csproj
@@ -4,4 +4,8 @@
    <ProjectReference Include="..\..\..\..\src\AspNetCore\OData\src\Asp.Versioning.OData\Asp.Versioning.OData.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+   <PackageReference Update="Microsoft.AspNetCore.OData" Version="9.2.1" />
+ </ItemGroup>
+
 </Project>
diff --git a/examples/AspNetCore/OData/ODataConventionsExample/ODataConventionsExample.csproj b/examples/AspNetCore/OData/ODataConventionsExample/ODataConventionsExample.csproj
@@ -4,4 +4,8 @@
   <ProjectReference Include="..\..\..\..\src\AspNetCore\OData\src\Asp.Versioning.OData\Asp.Versioning.OData.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+   <PackageReference Update="Microsoft.AspNetCore.OData" Version="9.2.1" />
+ </ItemGroup>
+
 </Project>
diff --git a/examples/AspNetCore/OData/ODataOpenApiExample/ODataOpenApiExample.csproj b/examples/AspNetCore/OData/ODataOpenApiExample/ODataOpenApiExample.csproj
@@ -12,4 +12,8 @@
    <ProjectReference Include="..\..\..\..\src\AspNetCore\OData\src\Asp.Versioning.OData.ApiExplorer\Asp.Versioning.OData.ApiExplorer.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+   <PackageReference Update="Microsoft.AspNetCore.OData" Version="9.2.1" />
+ </ItemGroup>
+
 </Project>
diff --git a/examples/AspNetCore/OData/SomeODataOpenApiExample/SomeODataOpenApiExample.csproj b/examples/AspNetCore/OData/SomeODataOpenApiExample/SomeODataOpenApiExample.csproj
@@ -12,4 +12,8 @@
    <ProjectReference Include="..\..\..\..\src\AspNetCore\OData\src\Asp.Versioning.OData.ApiExplorer\Asp.Versioning.OData.ApiExplorer.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+   <PackageReference Update="Microsoft.AspNetCore.OData" Version="9.2.1" />
+ </ItemGroup>
+
 </Project>
diff --git a/src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Conventions/ODataAttributeVisitor.cs b/src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Conventions/ODataAttributeVisitor.cs
@@ -13,6 +13,6 @@ private void VisitAction( HttpActionDescriptor action )
         var attributes = new List<EnableQueryAttribute>( controller.GetCustomAttributes<EnableQueryAttribute>( inherit: true ) );
 
         attributes.AddRange( action.GetCustomAttributes<EnableQueryAttribute>( inherit: true ) );
-        VisitEnableQuery( attributes );
+        VisitEnableQuery( attributes.ToArray() );
     }
 }
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Asp.Versioning.OData.ApiExplorer.csproj b/src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Asp.Versioning.OData.ApiExplorer.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>8.2.0</VersionPrefix>
+  <AssemblyVersion>8.2.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning API Explorer for OData v4.0</AssemblyTitle>
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData/Asp.Versioning.OData.csproj b/src/AspNetCore/OData/src/Asp.Versioning.OData/Asp.Versioning.OData.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>8.1.0</VersionPrefix>
-  <AssemblyVersion>8.1.0.0</AssemblyVersion>
+  <VersionPrefix>8.2.0</VersionPrefix>
+  <AssemblyVersion>8.2.0.0</AssemblyVersion>
   <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
   <RootNamespace>Asp.Versioning</RootNamespace>
   <AssemblyTitle>ASP.NET Core API Versioning with OData v4.0</AssemblyTitle>
@@ -15,7 +15,7 @@
  </ItemGroup>
 
  <ItemGroup>
-  <PackageReference Include="Microsoft.AspNetCore.OData" Version="[8.0.2,9.0.0)" />
+  <PackageReference Include="Microsoft.AspNetCore.OData" Version="[8.0.2,9.3.0)" />
  </ItemGroup>
 
  <ItemGroup>
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataApplicationModelProvider.cs b/src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataApplicationModelProvider.cs
@@ -141,7 +141,7 @@ private static
         return (metadataControllers, supported, deprecated);
     }
 
-    private static ControllerModel? SelectBestMetadataController( IReadOnlyList<ControllerModel> controllers )
+    private static ControllerModel? SelectBestMetadataController( List<ControllerModel> controllers )
     {
         // note: there should be at least 2 metadata controllers, but there could be 3+
         // if a developer defines their own custom controller. ultimately, there can be
diff --git a/src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/ApiExplorer/ODataApiDescriptionProviderTest.cs b/src/AspNetCore/OData/test/Asp.Versioning.OData.ApiExplorer.Tests/ApiExplorer/ODataApiDescriptionProviderTest.cs
@@ -256,9 +256,9 @@ private static void AssertQueryOptionWithoutOData( ApiDescription description, s
         parameter.ModelMetadata.Description.Should().EndWith( suffix + '.' );
     }
 
-    private void PrintGroup( IReadOnlyList<ApiDescription> items )
+    private void PrintGroup( ApiDescription[] items )
     {
-        for ( var i = 0; i < items.Count; i++ )
+        for ( var i = 0; i < items.Length; i++ )
         {
             var item = items[i];
             console.WriteLine( $"[{item.GroupName}] {item.HttpMethod} {item.RelativePath}" );
diff --git a/src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/DefaultApiControllerFilter.cs b/src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/DefaultApiControllerFilter.cs
@@ -10,7 +10,7 @@ namespace Asp.Versioning.ApplicationModels;
 [CLSCompliant( false )]
 public sealed class DefaultApiControllerFilter : IApiControllerFilter
 {
-    private readonly IReadOnlyList<IApiControllerSpecification> specifications;
+    private readonly List<IApiControllerSpecification> specifications;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DefaultApiControllerFilter"/> class.
@@ -19,7 +19,7 @@ public sealed class DefaultApiControllerFilter : IApiControllerFilter
     /// <see cref="IApiControllerSpecification">specifications</see> used by the filter
     /// to identify API controllers.</param>
     public DefaultApiControllerFilter( IEnumerable<IApiControllerSpecification> specifications ) =>
-        this.specifications = specifications.ToArray();
+        this.specifications = specifications.ToList();
 
     /// <inheritdoc />
     public IList<ControllerModel> Apply( IList<ControllerModel> controllers )
diff --git a/src/Common/src/Common.OData.ApiExplorer/Conventions/ODataAttributeVisitor.cs b/src/Common/src/Common.OData.ApiExplorer/Conventions/ODataAttributeVisitor.cs
@@ -76,11 +76,11 @@ private void VisitModel( IEdmStructuredType modelType )
         VisitMaxTop( querySettings );
     }
 
-    private void VisitEnableQuery( IReadOnlyList<EnableQueryAttribute> attributes )
+    private void VisitEnableQuery( EnableQueryAttribute[] attributes )
     {
         var @default = new EnableQueryAttribute();
 
-        for ( var i = 0; i < attributes.Count; i++ )
+        for ( var i = 0; i < attributes.Length; i++ )
         {
             var attribute = attributes[i];
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ private void VisitAction( HttpActionDescriptor action )`
`13`	`13`	`var attributes = new List<EnableQueryAttribute>( controller.GetCustomAttributes<EnableQueryAttribute>( inherit: true ) );`
`14`	`14`
`15`	`15`	`attributes.AddRange( action.GetCustomAttributes<EnableQueryAttribute>( inherit: true ) );`
`16`		`- VisitEnableQuery( attributes );`
	`16`	`+ VisitEnableQuery( attributes.ToArray() );`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private static`
`141`	`141`	`return (metadataControllers, supported, deprecated);`
`142`	`142`	`}`
`143`	`143`
`144`		`- private static ControllerModel? SelectBestMetadataController( IReadOnlyList<ControllerModel> controllers )`
	`144`	`+ private static ControllerModel? SelectBestMetadataController( List<ControllerModel> controllers )`
`145`	`145`	`{`
`146`	`146`	`// note: there should be at least 2 metadata controllers, but there could be 3+`
`147`	`147`	`// if a developer defines their own custom controller. ultimately, there can be`
Original file line number	Diff line number	Diff line change
`@@ -256,9 +256,9 @@ private static void AssertQueryOptionWithoutOData( ApiDescription description, s`
`256`	`256`	`parameter.ModelMetadata.Description.Should().EndWith( suffix + '.' );`
`257`	`257`	`}`
`258`	`258`
`259`		`- private void PrintGroup( IReadOnlyList<ApiDescription> items )`
	`259`	`+ private void PrintGroup( ApiDescription[] items )`
`260`	`260`	`{`
`261`		`- for ( var i = 0; i < items.Count; i++ )`
	`261`	`+ for ( var i = 0; i < items.Length; i++ )`
`262`	`262`	`{`
`263`	`263`	`var item = items[i];`
`264`	`264`	`console.WriteLine( $"[{item.GroupName}] {item.HttpMethod} {item.RelativePath}" );`
Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ private void VisitModel( IEdmStructuredType modelType )`
`76`	`76`	`VisitMaxTop( querySettings );`
`77`	`77`	`}`
`78`	`78`
`79`		`- private void VisitEnableQuery( IReadOnlyList<EnableQueryAttribute> attributes )`
	`79`	`+ private void VisitEnableQuery( EnableQueryAttribute[] attributes )`
`80`	`80`	`{`
`81`	`81`	`var @default = new EnableQueryAttribute();`
`82`	`82`
`83`		`- for ( var i = 0; i < attributes.Count; i++ )`
	`83`	`+ for ( var i = 0; i < attributes.Length; i++ )`
`84`	`84`	`{`
`85`	`85`	`var attribute = attributes[i];`
`86`	`86`