Clean up obsolete types in Razor

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/LazyMetadataReferenceFeature.cs

@@ -23,6 +23,8 @@ public LazyMetadataReferenceFeature(RazorReferenceManager referenceManager)
         /// </remarks>
         public IReadOnlyList<MetadataReference> References => _referenceManager.CompilationReferences;
 
+#pragma warning disable CS0618
         public RazorEngine Engine { get; set; }
+#pragma warning restore CS0628
     }
 }

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

@@ -77,7 +77,6 @@ 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

@@ -41,7 +41,7 @@ internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
         {
             // Runs after the @model and @namespace directives
             public override int Order => 10;
-            
+
             protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
             {
                 var visitor = new Visitor();
@@ -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.Version1_X/test/InjectDirectiveTest.cs

@@ -172,7 +172,9 @@ private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
             return visitor.Node;
         }
 
+#pragma warning disable CS0618
         private RazorEngine CreateEngine()
+#pragma warning restore CS0618
         {
             var configuration = RazorConfiguration.Create(RazorLanguageVersion.Version_1_1, "test", Array.Empty<RazorExtension>());
             return RazorProjectEngine.Create(configuration, RazorProjectFileSystem.Empty, b =>
@@ -183,7 +185,9 @@ private RazorEngine CreateEngine()
             }).Engine;
         }
 
+#pragma warning disable CS0618
         private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+#pragma warning restore CS0618
         {
             for (var i = 0; i < engine.Phases.Count; i++)
             {
@@ -224,4 +228,4 @@ public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node
             }
         }
     }
-}
+}

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs

@@ -236,17 +236,23 @@ private NamespaceDeclarationIntermediateNode FindNamespaceNode(IntermediateNode
             return visitor.Node;
         }
 
+#pragma warning disable CS0618
         private RazorEngine CreateRuntimeEngine()
+#pragma warning restore CS0618
         {
             return CreateEngineCore();
         }
 
+#pragma warning disable CS0618
         private RazorEngine CreateDesignTimeEngine()
+#pragma warning restore CS0618
         {
             return CreateEngineCore(designTime: true);
         }
 
+#pragma warning disable CS0618
         private RazorEngine CreateEngineCore(bool designTime = false)
+#pragma warning restore CS0618
         {
             return CreateProjectEngine(b =>
             {
@@ -260,7 +266,9 @@ private RazorEngine CreateEngineCore(bool designTime = false)
             }).Engine;
         }
 
+#pragma warning disable CS0618
         private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+#pragma warning restore CS0618
         {
             for (var i = 0; i < engine.Phases.Count; i++)
             {
@@ -329,7 +337,9 @@ public DesignTimeOptionsFeature(bool designTime)
 
             public int Order { get; }
 
+#pragma warning disable CS0618
             public RazorEngine Engine { get; set; }
+#pragma warning restore CS0618
 
             public void Configure(RazorParserOptionsBuilder options)
             {
@@ -342,4 +352,4 @@ public void Configure(RazorCodeGenerationOptionsBuilder options)
             }
         }
     }
-}
+}

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs

@@ -149,15 +149,19 @@ private RazorCodeDocument CreateDocument(string content)
             return RazorCodeDocument.Create(source);
         }
 
+#pragma warning disable CS0618
         private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+#pragma warning restore CS0618
         {
             return RazorProjectEngine.Create(b =>
             {
                 b.Features.Add(new TestTagHelperFeature(tagHelpers));
             }).Engine;
         }
 
+#pragma warning disable CS0618
         private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+#pragma warning restore CS0618
         {
             for (var i = 0; i < engine.Phases.Count; i++)
             {
@@ -205,4 +209,4 @@ public override void VisitTagHelper(TagHelperIntermediateNode node)
             }
         }
     }
-}
+}

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperPassTest.cs

@@ -206,7 +206,9 @@ private RazorCodeDocument CreateDocument(string content)
             return RazorCodeDocument.Create(source);
         }
 
+#pragma warning disable CS0618
         private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+#pragma warning restore CS0618
         {
             return RazorProjectEngine.Create(b =>
             {
@@ -216,7 +218,9 @@ private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
             }).Engine;
         }
 
+#pragma warning disable CS0618
         private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+#pragma warning restore CS0618
         {
             for (var i = 0; i < engine.Phases.Count; i++)
             {

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

@@ -41,7 +41,7 @@ internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
         {
             // Runs after the @model and @namespace directives
             public override int Order => 10;
-            
+
             protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
             {
                 var visitor = new Visitor();
@@ -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

@@ -128,7 +128,7 @@ internal static string GetNamespace(string source, DirectiveIntermediateNode dir
         // both 'view engine' style paths and absolute paths.
         //
         // We also don't normalize the separators here. We expect that all documents are using a consistent style of path.
-        // 
+        //
         // If we can't normalize the path, we just return null so it will be ignored.
         private static string NormalizeDirectory(string path)
         {
@@ -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
     }
 }