Follow-up to cleaning up obsolete types in Razor

Author: captainsafia

src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectFileSystem.cs

@@ -34,7 +34,6 @@ public FileProviderRazorProjectFileSystem(RuntimeCompilationFileProvider filePro
 
         public IFileProvider FileProvider => _fileProvider.FileProvider;
 
-        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public override RazorProjectItem GetItem(string path)
         {
             return GetItem(path, fileKind: null);
@@ -96,4 +95,4 @@ private static string JoinPath(string path1, string path2)
             return path1 + "/" + path2;
         }
     }
-}
+}

src/Mvc/Mvc.Razor.RuntimeCompilation/src/PageDirectiveFeature.cs

@@ -77,7 +77,7 @@ public override IEnumerable<RazorProjectItem> FindHierarchicalItems(string baseP
                 return Enumerable.Empty<RazorProjectItem>();
             }
 
-            [Obsolete("Use GetItem(string path, string fileKind) instead.")]
+
             public override RazorProjectItem GetItem(string path)
             {
                 return GetItem(path, fileKind: null);

src/Mvc/Mvc.Razor.RuntimeCompilation/test/TestInfrastructure/VirtualRazorProjectFileSystem.cs

@@ -18,7 +18,6 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
             return directory?.EnumerateItems() ?? Enumerable.Empty<RazorProjectItem>();
         }
 
-        [Obsolete("Use GetItem(string path, string fileKind) instead.")]
         public override RazorProjectItem GetItem(string path)
         {
             return GetItem(path, fileKind: null);
@@ -44,4 +43,4 @@ public void Add(RazorProjectItem projectItem)
             _root.AddFile(new FileNode(filePath, projectItem));
         }
     }
-}
+}

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/InjectDirective.cs

@@ -104,21 +104,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
                 }
             }
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-            builder.AddTargetExtension(new InjectTargetExtension());
-            return builder;
-        }
-        #endregion
     }
 }

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ModelDirective.cs

@@ -126,20 +126,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
                 }
             }
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-            return builder;
-        }
-        #endregion
     }
 }

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/RazorExtensions.cs

@@ -56,66 +56,5 @@ public static void RegisterViewComponentTagHelpers(RazorProjectEngineBuilder bui
             builder.Features.Add(new ViewComponentTagHelperPass());
             builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static void Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            EnsureDesignTime(builder);
-
-            InjectDirective.Register(builder);
-            ModelDirective.Register(builder);
-
-            FunctionsDirective.Register(builder);
-            InheritsDirective.Register(builder);
-
-            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
-
-            // Register section directive with the 1.x compatible target extension.
-            builder.AddDirective(SectionDirective.Directive);
-            builder.Features.Add(new SectionDirectivePass());
-            builder.AddTargetExtension(new LegacySectionTargetExtension());
-
-            builder.AddTargetExtension(new TemplateTargetExtension()
-            {
-                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
-            });
-
-            builder.Features.Add(new ModelExpressionPass());
-            builder.Features.Add(new MvcViewDocumentClassifierPass());
-        }
-
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static void RegisterViewComponentTagHelpers(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            EnsureDesignTime(builder);
-
-            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
-            builder.Features.Add(new ViewComponentTagHelperPass());
-            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        private static void EnsureDesignTime(IRazorEngineBuilder builder)
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-            if (builder.DesignTime)
-            {
-                return;
-            }
-
-            throw new NotSupportedException(Resources.RuntimeCodeGenerationNotSupported);
-        }
-        #endregion
     }
 }

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/InjectDirective.cs

@@ -104,21 +104,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
                 }
             }
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-            builder.AddTargetExtension(new InjectTargetExtension());
-            return builder;
-        }
-        #endregion
     }
 }

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ModelDirective.cs

@@ -133,20 +133,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
                 }
             }
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-            return builder;
-        }
-        #endregion
     }
 }

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/NamespaceDirective.cs

@@ -186,19 +186,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
                 base.VisitDirective(node);
             }
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static void Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException();
-            }
-
-            builder.AddDirective(Directive);
-            builder.Features.Add(new Pass());
-        }
-        #endregion
     }
 }

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/PageDirective.cs

@@ -103,19 +103,5 @@ public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode
                 }
             }
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            builder.AddDirective(Directive);
-            return builder;
-        }
-        #endregion
     }
 }