Version-neutral APIs should be deprecated if they have an effective policy

Author: commonsensesoftware

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/ApiExplorer/ODataApiExplorer.cs

@@ -548,7 +548,17 @@ private void PopulateActionDescriptions(
         var supportedMethods = GetHttpMethodsSupportedByAction( route, actionDescriptor );
         var metadata = actionDescriptor.ApiVersionMetadata;
         var model = metadata.Map( ApiVersionMapping.Explicit );
-        var deprecated = !model.IsApiVersionNeutral && model.DeprecatedApiVersions.Contains( apiVersion );
+        var deprecationPolicy = DeprecationPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion );
+        bool deprecated;
+
+        if ( model.IsApiVersionNeutral )
+        {
+            deprecated = deprecationPolicy != null && deprecationPolicy.IsEffective( DateTimeOffset.Now );
+        }
+        else
+        {
+            deprecated = model.DeprecatedApiVersions.Contains( apiVersion );
+        }
 
         PopulateMediaTypeFormatters( actionDescriptor, routeBuilderContext.ParameterDescriptions, route, responseType, requestFormatters, responseFormatters );
 
@@ -566,7 +576,7 @@ private void PopulateActionDescriptions(
                 ApiVersion = apiVersion,
                 IsDeprecated = deprecated,
                 SunsetPolicy = SunsetPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion ),
-                DeprecationPolicy = DeprecationPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion ),
+                DeprecationPolicy = deprecationPolicy,
                 Properties = { [typeof( IEdmModel )] = routeBuilderContext.EdmModel },
             };
 

src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/ApiExplorer/VersionedApiExplorer.cs

@@ -876,7 +876,17 @@ private void PopulateActionDescriptions(
         var supportedMethods = GetHttpMethodsSupportedByAction( route, actionDescriptor );
         var metadata = actionDescriptor.ApiVersionMetadata;
         var model = metadata.Map( Explicit );
-        var deprecated = !model.IsApiVersionNeutral && model.DeprecatedApiVersions.Contains( apiVersion );
+        var deprecationPolicy = DeprecationPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion );
+        bool deprecated;
+
+        if ( model.IsApiVersionNeutral )
+        {
+            deprecated = deprecationPolicy != null && deprecationPolicy.IsEffective( DateTimeOffset.Now );
+        }
+        else
+        {
+            deprecated = model.DeprecatedApiVersions.Contains( apiVersion );
+        }
 
         for ( var i = 0; i < supportedMethods.Count; i++ )
         {
@@ -891,7 +901,7 @@ private void PopulateActionDescriptions(
                 ApiVersion = apiVersion,
                 IsDeprecated = deprecated,
                 SunsetPolicy = SunsetPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion ),
-                DeprecationPolicy = DeprecationPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion ),
+                DeprecationPolicy = deprecationPolicy,
             };
 
             foreach ( var supportedResponseFormatter in supportedResponseFormatters )