Fix compiler errors.

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApiExplorerOptionsFactory.cs

@@ -107,6 +107,6 @@ private static ODataApiVersionCollectionProvider CollateApiVersions(
 
     private sealed class ODataApiVersionCollectionProvider : IODataApiVersionCollectionProvider
     {
-        required public IReadOnlyList<ApiVersion> ApiVersions { get; set; }
+        public required IReadOnlyList<ApiVersion> ApiVersions { get; set; }
     }
 }

src/AspNetCore/WebApi/src/Asp.Versioning.Http/DependencyInjection/IServiceCollectionExtensions.cs

@@ -85,9 +85,9 @@ private static void AddApiVersioningServices( IServiceCollection services )
         }
 
         services.TryAddSingleton<IApiVersionParser, ApiVersionParser>();
-        services.Add( Singleton( sp => sp.GetRequiredService<IOptions<ApiVersioningOptions>>().Value.ApiVersionReader ) );
-        services.Add( Singleton( sp => (IApiVersionParameterSource) sp.GetRequiredService<IOptions<ApiVersioningOptions>>().Value.ApiVersionReader ) );
-        services.Add( Singleton( sp => sp.GetRequiredService<IOptions<ApiVersioningOptions>>().Value.ApiVersionSelector ) );
+        services.AddSingleton( sp => sp.GetRequiredService<IOptions<ApiVersioningOptions>>().Value.ApiVersionReader );
+        services.AddSingleton( sp => (IApiVersionParameterSource) sp.GetRequiredService<IOptions<ApiVersioningOptions>>().Value.ApiVersionReader ) ;
+        services.AddSingleton( sp => sp.GetRequiredService<IOptions<ApiVersioningOptions>>().Value.ApiVersionSelector );
         services.TryAddSingleton<IReportApiVersions, DefaultApiVersionReporter>();
         services.TryAddSingleton<ISunsetPolicyManager, SunsetPolicyManager>();
         services.TryAddEnumerable( Transient<IPostConfigureOptions<RouteOptions>, ApiVersioningRouteOptionsSetup>() );

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApiVersioningApplicationModelProvider.cs

@@ -14,8 +14,7 @@ namespace Asp.Versioning;
 [CLSCompliant( false )]
 public class ApiVersioningApplicationModelProvider : IApplicationModelProvider
 {
-    private readonly IOptions<ApiVersioningOptions> options;
-    private readonly IOptions<MvcApiVersioningOptions> mvcOptions;
+    private readonly MvcApiVersioningOptions mvcOptions;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ApiVersioningApplicationModelProvider"/> class.
@@ -32,8 +31,8 @@ public ApiVersioningApplicationModelProvider(
     {
         ControllerFilter = controllerFilter;
         NamingConvention = namingConvention;
-        this.options = options;
-        this.mvcOptions = mvcOptions;
+        Options = options?.Value ?? throw new ArgumentNullException( nameof( options ) );
+        this.mvcOptions = mvcOptions?.Value ?? throw new ArgumentNullException( nameof( mvcOptions ) );
     }
 
     /// <inheritdoc />
@@ -55,13 +54,13 @@ public ApiVersioningApplicationModelProvider(
     /// Gets the builder used to define API version conventions.
     /// </summary>
     /// <value>An <see cref="IApiVersionConventionBuilder">API version convention builder</see>.</value>
-    protected IApiVersionConventionBuilder ConventionBuilder => mvcOptions.Value.Conventions;
+    protected IApiVersionConventionBuilder ConventionBuilder => mvcOptions.Conventions;
 
     /// <summary>
     /// Gets the API versioning options associated with the model provider.
     /// </summary>
     /// <value>The current <see cref="ApiVersioningOptions">API versioning options</see>.</value>
-    protected ApiVersioningOptions Options => options.Value;
+    protected ApiVersioningOptions Options { get; }
 
     /// <inheritdoc />
     public virtual void OnProvidersExecuted( ApplicationModelProviderContext context ) { }

src/Common/src/Common.OData.ApiExplorer/OData/ODataValue{T}.cs

@@ -23,6 +23,6 @@ public class ODataValue<T>
 #if NETFRAMEWORK
     public T Value { get; set; } = default!;
 #else
-    required public T Value { get; set; }
+    public required T Value { get; set; }
 #endif
 }

src/Common/src/Common.OData/OData/ODataId.cs

@@ -21,6 +21,6 @@ public class ODataId
 #if NETFRAMEWORK
     public Uri Value { get; set; } = default!;
 #else
-    required public Uri Value { get; set; }
+    public required Uri Value { get; set; }
 #endif
 }