Skip to content

Commit 0ccc3d6

Browse files
committed
Follow-up to cleaning up obsolete types in Razor
1 parent 09a036f commit 0ccc3d6

File tree

25 files changed

+7
-260
lines changed

25 files changed

+7
-260
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public FileProviderRazorProjectFileSystem(RuntimeCompilationFileProvider filePro
3434

3535
public IFileProvider FileProvider => _fileProvider.FileProvider;
3636

37-
[Obsolete("Use GetItem(string path, string fileKind) instead.")]
3837
public override RazorProjectItem GetItem(string path)
3938
{
4039
return GetItem(path, fileKind: null);
@@ -96,4 +95,4 @@ private static string JoinPath(string path1, string path2)
9695
return path1 + "/" + path2;
9796
}
9897
}
99-
}
98+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override IEnumerable<RazorProjectItem> FindHierarchicalItems(string baseP
7777
return Enumerable.Empty<RazorProjectItem>();
7878
}
7979

80-
[Obsolete("Use GetItem(string path, string fileKind) instead.")]
80+
8181
public override RazorProjectItem GetItem(string path)
8282
{
8383
return GetItem(path, fileKind: null);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
1818
return directory?.EnumerateItems() ?? Enumerable.Empty<RazorProjectItem>();
1919
}
2020

21-
[Obsolete("Use GetItem(string path, string fileKind) instead.")]
2221
public override RazorProjectItem GetItem(string path)
2322
{
2423
return GetItem(path, fileKind: null);
@@ -44,4 +43,4 @@ public void Add(RazorProjectItem projectItem)
4443
_root.AddFile(new FileNode(filePath, projectItem));
4544
}
4645
}
47-
}
46+
}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
104104
}
105105
}
106106
}
107-
108-
#region Obsolete
109-
[Obsolete("This method is obsolete and will be removed in a future version.")]
110-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
111-
{
112-
if (builder == null)
113-
{
114-
throw new ArgumentNullException(nameof(builder));
115-
}
116-
117-
builder.AddDirective(Directive);
118-
builder.Features.Add(new Pass());
119-
builder.AddTargetExtension(new InjectTargetExtension());
120-
return builder;
121-
}
122-
#endregion
123107
}
124108
}

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
126126
}
127127
}
128128
}
129-
130-
#region Obsolete
131-
[Obsolete("This method is obsolete and will be removed in a future version.")]
132-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
133-
{
134-
if (builder == null)
135-
{
136-
throw new ArgumentNullException(nameof(builder));
137-
}
138-
139-
builder.AddDirective(Directive);
140-
builder.Features.Add(new Pass());
141-
return builder;
142-
}
143-
#endregion
144129
}
145130
}

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

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -56,66 +56,5 @@ public static void RegisterViewComponentTagHelpers(RazorProjectEngineBuilder bui
5656
builder.Features.Add(new ViewComponentTagHelperPass());
5757
builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
5858
}
59-
60-
#region Obsolete
61-
[Obsolete("This method is obsolete and will be removed in a future version.")]
62-
public static void Register(IRazorEngineBuilder builder)
63-
{
64-
if (builder == null)
65-
{
66-
throw new ArgumentNullException(nameof(builder));
67-
}
68-
69-
EnsureDesignTime(builder);
70-
71-
InjectDirective.Register(builder);
72-
ModelDirective.Register(builder);
73-
74-
FunctionsDirective.Register(builder);
75-
InheritsDirective.Register(builder);
76-
77-
builder.Features.Add(new DefaultTagHelperDescriptorProvider());
78-
79-
// Register section directive with the 1.x compatible target extension.
80-
builder.AddDirective(SectionDirective.Directive);
81-
builder.Features.Add(new SectionDirectivePass());
82-
builder.AddTargetExtension(new LegacySectionTargetExtension());
83-
84-
builder.AddTargetExtension(new TemplateTargetExtension()
85-
{
86-
TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
87-
});
88-
89-
builder.Features.Add(new ModelExpressionPass());
90-
builder.Features.Add(new MvcViewDocumentClassifierPass());
91-
}
92-
93-
[Obsolete("This method is obsolete and will be removed in a future version.")]
94-
public static void RegisterViewComponentTagHelpers(IRazorEngineBuilder builder)
95-
{
96-
if (builder == null)
97-
{
98-
throw new ArgumentNullException(nameof(builder));
99-
}
100-
101-
EnsureDesignTime(builder);
102-
103-
builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
104-
builder.Features.Add(new ViewComponentTagHelperPass());
105-
builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
106-
}
107-
108-
#pragma warning disable CS0618 // Type or member is obsolete
109-
private static void EnsureDesignTime(IRazorEngineBuilder builder)
110-
#pragma warning restore CS0618 // Type or member is obsolete
111-
{
112-
if (builder.DesignTime)
113-
{
114-
return;
115-
}
116-
117-
throw new NotSupportedException(Resources.RuntimeCodeGenerationNotSupported);
118-
}
119-
#endregion
12059
}
12160
}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
104104
}
105105
}
106106
}
107-
108-
#region Obsolete
109-
[Obsolete("This method is obsolete and will be removed in a future version.")]
110-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
111-
{
112-
if (builder == null)
113-
{
114-
throw new ArgumentNullException(nameof(builder));
115-
}
116-
117-
builder.AddDirective(Directive);
118-
builder.Features.Add(new Pass());
119-
builder.AddTargetExtension(new InjectTargetExtension());
120-
return builder;
121-
}
122-
#endregion
123107
}
124108
}

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
133133
}
134134
}
135135
}
136-
137-
#region Obsolete
138-
[Obsolete("This method is obsolete and will be removed in a future version.")]
139-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
140-
{
141-
if (builder == null)
142-
{
143-
throw new ArgumentNullException(nameof(builder));
144-
}
145-
146-
builder.AddDirective(Directive);
147-
builder.Features.Add(new Pass());
148-
return builder;
149-
}
150-
#endregion
151136
}
152137
}

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -186,19 +186,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
186186
base.VisitDirective(node);
187187
}
188188
}
189-
190-
#region Obsolete
191-
[Obsolete("This method is obsolete and will be removed in a future version.")]
192-
public static void Register(IRazorEngineBuilder builder)
193-
{
194-
if (builder == null)
195-
{
196-
throw new ArgumentNullException();
197-
}
198-
199-
builder.AddDirective(Directive);
200-
builder.Features.Add(new Pass());
201-
}
202-
#endregion
203189
}
204190
}

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,5 @@ public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode
103103
}
104104
}
105105
}
106-
107-
#region Obsolete
108-
[Obsolete("This method is obsolete and will be removed in a future version.")]
109-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
110-
{
111-
if (builder == null)
112-
{
113-
throw new ArgumentNullException(nameof(builder));
114-
}
115-
116-
builder.AddDirective(Directive);
117-
return builder;
118-
}
119-
#endregion
120106
}
121107
}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
111111
}
112112
}
113113
}
114-
115-
#region Obsolete
116-
[Obsolete("This method is obsolete and will be removed in a future version.")]
117-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
118-
{
119-
if (builder == null)
120-
{
121-
throw new ArgumentNullException(nameof(builder));
122-
}
123-
124-
builder.AddDirective(Directive);
125-
builder.Features.Add(new Pass());
126-
builder.AddTargetExtension(new InjectTargetExtension());
127-
return builder;
128-
}
129-
#endregion
130114
}
131115
}

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,20 +140,5 @@ public override void VisitDirective(DirectiveIntermediateNode node)
140140
}
141141
}
142142
}
143-
144-
#region Obsolete
145-
[Obsolete("This method is obsolete and will be removed in a future version.")]
146-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
147-
{
148-
if (builder == null)
149-
{
150-
throw new ArgumentNullException(nameof(builder));
151-
}
152-
153-
builder.AddDirective(Directive);
154-
builder.Features.Add(new Pass());
155-
return builder;
156-
}
157-
#endregion
158143
}
159144
}

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,5 @@ public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode
103103
}
104104
}
105105
}
106-
107-
#region Obsolete
108-
[Obsolete("This method is obsolete and will be removed in a future version.")]
109-
public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
110-
{
111-
if (builder == null)
112-
{
113-
throw new ArgumentNullException(nameof(builder));
114-
}
115-
116-
builder.AddDirective(Directive);
117-
return builder;
118-
}
119-
#endregion
120106
}
121107
}

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/PublicAPI.Shipped.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,9 @@ override Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperPass.Or
6060
~override Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperIntermediateNode.FormatNode(Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeFormatter formatter) -> void
6161
~override Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperIntermediateNode.WriteNode(Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget target, Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext context) -> void
6262
~override Microsoft.AspNetCore.Mvc.Razor.Extensions.ViewComponentTagHelperPass.ExecuteCore(Microsoft.AspNetCore.Razor.Language.RazorCodeDocument codeDocument, Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode documentNode) -> void
63-
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectDirective.Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder) -> Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder
6463
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.InjectDirective.Register(Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder builder) -> Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder
6564
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelDirective.GetModelType(Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode document) -> string
66-
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelDirective.Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder) -> Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder
6765
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.ModelDirective.Register(Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder builder) -> Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder
68-
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective.Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder) -> Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder
6966
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective.Register(Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder builder) -> Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder
7067
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective.TryGetPageDirective(Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode documentNode, out Microsoft.AspNetCore.Mvc.Razor.Extensions.PageDirective pageDirective) -> bool
7168
~static Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions.Register(Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder builder) -> void

src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorProjectFileSystem.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public DefaultRazorProjectFileSystem(string root)
1616
{
1717
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(root));
1818
}
19-
19+
2020
Root = root.Replace('\\', '/').TrimEnd('/');
2121
}
2222

@@ -61,7 +61,6 @@ public override RazorProjectItem GetItem(string path, string fileKind)
6161
return new DefaultRazorProjectItem("/", filePath, relativePhysicalPath, fileKind, new FileInfo(absolutePath), cssScope: null);
6262
}
6363

64-
[Obsolete("Use GetItem(string path, string fileKind) instead.")]
6564
public override RazorProjectItem GetItem(string path)
6665
{
6766
return GetItem(path, fileKind: null);

src/Razor/Microsoft.AspNetCore.Razor.Language/src/EmptyProjectFileSystem.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
1515
return Enumerable.Empty<RazorProjectItem>();
1616
}
1717

18-
[Obsolete("Use GetItem(string path, string fileKind) instead.")]
1918
public override RazorProjectItem GetItem(string path)
2019
{
2120
return GetItem(path, fileKind: null);

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/FunctionsDirective.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,5 @@ public static void Register(RazorProjectEngineBuilder builder)
2626
builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component);
2727
builder.Features.Add(new FunctionsDirectivePass());
2828
}
29-
30-
#region Obsolete
31-
[Obsolete("This method is obsolete and will be removed in a future version.")]
32-
public static void Register(IRazorEngineBuilder builder)
33-
{
34-
if (builder == null)
35-
{
36-
throw new ArgumentNullException(nameof(builder));
37-
}
38-
39-
builder.AddDirective(Directive);
40-
builder.Features.Add(new FunctionsDirectivePass());
41-
}
42-
#endregion
4329
}
4430
}

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/InheritsDirective.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,5 @@ public static void Register(RazorProjectEngineBuilder builder)
2828
builder.AddDirective(Directive, FileKinds.Legacy, FileKinds.Component, FileKinds.ComponentImport);
2929
builder.Features.Add(new InheritsDirectivePass());
3030
}
31-
32-
#region Obsolete
33-
[Obsolete("This method is obsolete and will be removed in a future version.")]
34-
public static void Register(IRazorEngineBuilder builder)
35-
{
36-
if (builder == null)
37-
{
38-
throw new ArgumentNullException(nameof(builder));
39-
}
40-
41-
builder.AddDirective(Directive);
42-
builder.Features.Add(new InheritsDirectivePass());
43-
}
44-
#endregion
4531
}
4632
}

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Extensions/SectionDirective.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,5 @@ public static void Register(RazorProjectEngineBuilder builder)
2828
builder.Features.Add(new SectionDirectivePass());
2929
builder.AddTargetExtension(new SectionTargetExtension());
3030
}
31-
32-
#region Obsolete
33-
[Obsolete("This method is obsolete and will be removed in a future version.")]
34-
public static void Register(IRazorEngineBuilder builder)
35-
{
36-
if (builder == null)
37-
{
38-
throw new ArgumentNullException(nameof(builder));
39-
}
40-
41-
builder.AddDirective(Directive);
42-
builder.Features.Add(new SectionDirectivePass());
43-
builder.AddTargetExtension(new SectionTargetExtension());
44-
}
45-
#endregion
4631
}
4732
}

0 commit comments

Comments
 (0)