huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from f0bc410c4b

This commit is contained in:
John Luo 2020-02-28 13:35:44 -08:00 committed by GitHub
parent ca63634583 d41276b0fa
commit b8cd714033
122 changed files with 1561 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTagHelperDescriptorFactory.cs
View File

@ -110,11 +110,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
{
// Will invoke asynchronously. Method must not return Task or Task<T>.
if (Equals(returnType, _taskSymbol))
if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
{
// This is ok.
}
else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
{
// This is ok.
}
@ -134,13 +134,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
method = null;
return false;
}
else if (Equals(returnType, _taskSymbol))
else if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
{
diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
method = null;
return false;
}
else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
{
diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
method = null;
@ -208,13 +208,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
private string GetIndexerValueTypeName(IParameterSymbol parameter)
{
INamedTypeSymbol dictionaryType;
if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
if (SymbolEqualityComparer.Default.Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
{
dictionaryType = (INamedTypeSymbol)parameter.Type;
}
else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
else if (parameter.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
{
dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
dictionaryType = parameter.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
}
else
{
@ -234,7 +234,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
private string GetShortName(INamedTypeSymbol componentType)
{
var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
var viewComponentAttribute = componentType.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
var name = viewComponentAttribute
?.NamedArguments
.Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/src/ViewComponentTypeVisitor.cs
View File

@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
return false;
}
var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
var attribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
if (attribute != null)
{

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/LegacySectionTargetExtensionTest.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
";
var output = context.CodeWriter.GenerateCode();
Assert.Equal(expected, output);
Assert.Equal(expected, output, ignoreLineEndingDifferences: true);
}
}
}

16
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTagHelperDescriptorFactory.cs
View File

@ -104,11 +104,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
{
// Will invoke asynchronously. Method must not return Task or Task<T>.
if (Equals(returnType, _taskSymbol))
if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
{
// This is ok.
}
else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
{
// This is ok.
}
@ -128,13 +128,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
method = null;
return false;
}
else if (Equals(returnType, _taskSymbol))
else if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
{
diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
method = null;
return false;
}
else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
{
diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
method = null;
@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
private string GetIndexerValueTypeName(IParameterSymbol parameter)
{
INamedTypeSymbol dictionaryType;
if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
if (SymbolEqualityComparer.Default.Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
{
dictionaryType = (INamedTypeSymbol)parameter.Type;
}
else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
else if (parameter.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
{
dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
dictionaryType = parameter.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
}
else
{
@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
private string GetShortName(INamedTypeSymbol componentType)
{
var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
var viewComponentAttribute = componentType.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
var name = viewComponentAttribute
?.NamedArguments
.Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/src/ViewComponentTypeVisitor.cs
View File

@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
return false;
}
var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
var attribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
if (attribute != null)
{

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
View File

@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
// Arrange
var content = @"
@* some comment *@
@page
";
var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
@ -363,7 +363,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
{
PageDirective.Register(builder);
}
private static DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
{
for (var i = 0; i < engine.Phases.Count; i++)

16
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorFactory.cs
View File

@ -104,11 +104,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
{
// Will invoke asynchronously. Method must not return Task or Task<T>.
if (Equals(returnType, _taskSymbol))
if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
{
// This is ok.
}
else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
{
// This is ok.
}
@ -128,13 +128,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
method = null;
return false;
}
else if (Equals(returnType, _taskSymbol))
else if (SymbolEqualityComparer.Default.Equals(returnType, _taskSymbol))
{
diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
method = null;
return false;
}
else if (returnType.IsGenericType && Equals(returnType.ConstructedFrom, _genericTaskSymbol))
else if (returnType.IsGenericType && SymbolEqualityComparer.Default.Equals(returnType.ConstructedFrom, _genericTaskSymbol))
{
diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
method = null;
@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
private string GetIndexerValueTypeName(IParameterSymbol parameter)
{
INamedTypeSymbol dictionaryType;
if (Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
if (SymbolEqualityComparer.Default.Equals((parameter.Type as INamedTypeSymbol)?.ConstructedFrom, _iDictionarySymbol))
{
dictionaryType = (INamedTypeSymbol)parameter.Type;
}
else if (parameter.Type.AllInterfaces.Any(s => Equals(s.ConstructedFrom, _iDictionarySymbol)))
else if (parameter.Type.AllInterfaces.Any(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol)))
{
dictionaryType = parameter.Type.AllInterfaces.First(s => Equals(s.ConstructedFrom, _iDictionarySymbol));
dictionaryType = parameter.Type.AllInterfaces.First(s => SymbolEqualityComparer.Default.Equals(s.ConstructedFrom, _iDictionarySymbol));
}
else
{
@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
private string GetShortName(INamedTypeSymbol componentType)
{
var viewComponentAttribute = componentType.GetAttributes().Where(a => Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
var viewComponentAttribute = componentType.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, _viewComponentAttributeSymbol)).FirstOrDefault();
var name = viewComponentAttribute
?.NamedArguments
.Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTypeVisitor.cs
View File

@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
return false;
}
var attribute = type.GetAttributes().Where(a => Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
var attribute = type.GetAttributes().Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, queryAttribute)).FirstOrDefault();
if (attribute != null)
{

24
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
View File

@ -540,6 +540,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -559,6 +560,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -584,6 +586,7 @@ public class MyService<TModel>
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -620,6 +623,7 @@ public class MyModel
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -655,6 +659,7 @@ public class MyModel
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -674,6 +679,7 @@ public class MyModel
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -693,6 +699,7 @@ public class MyModel
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -712,6 +719,7 @@ public class MyModel
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -728,6 +736,7 @@ public class MyModel
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -753,6 +762,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -769,6 +779,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -792,6 +803,7 @@ public class MyApp
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -824,6 +836,7 @@ public class MyApp
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -857,6 +870,7 @@ public class MyService<TModel>
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -873,6 +887,7 @@ public class MyService<TModel>
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -895,6 +910,7 @@ public class ThisShouldBeGenerated
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -923,6 +939,7 @@ public class InputTestTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -946,6 +963,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -962,6 +980,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -985,6 +1004,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -1001,6 +1021,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -1017,6 +1038,7 @@ public class DivTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -1049,6 +1071,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
@ -1065,6 +1088,7 @@ public class AllTagHelper : {typeof(TagHelper).FullName}
// Assert
AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(compiled.CodeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
AssertLinePragmas(compiled.CodeDocument, designTime: true);
AssertSourceMappingsMatchBaseline(compiled.CodeDocument);

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
View File

@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
// Arrange
var content = @"
@* some comment *@
@page
";
var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));

1
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

9
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,9 @@
<div class=" ">
Hello world
</div>

8
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,8 @@
<div class=" ">
Hello world
</div>
<p class=" " />

15
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,15 @@
"

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@

3
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@

5
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,5 @@

1
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

1
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@
Test.

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,4 @@
"foo
<h1>About Us</h1>
<p>We are awesome.</p>

6
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,6 @@
<input-test for=" " />
<input-test for=" " />

1
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@

3
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
<h1>Hi There!</h1>

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@
<div>Some text here.</div>

13
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,13 @@
<h1>New Customer </h1>

36
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,36 @@
<h1>New Customer</h1>
<form method="post" class="form-horizontal">
<div class="text-danger"></div>
<div class="form-group">
<label class="col-md-2 control-label"> </label>
<div class="col-md-10">
<input class="form-control" />
<span class="text-danger"></span>
</div>
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button type="submit" class="btn btn-primary">Save</button>
</div>
</div>
</form>

40
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,40 @@
<h1>New Customer</h1>
<form method="post" class="form-horizontal" >
<div class="text-danger"></div>
<div class="form-group">
<label class="col-md-2 control-label"> </label>
<div class="col-md-10">
<input class="form-control" />
<span class="text-danger"></span>
</div>
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button type="submit" class="btn btn-primary">Save</button>
</div>
</div>
</form>

14
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,14 @@
<div>Some body</div>
<div>This is in Section 1</div>
<input-test for=" " />

4
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,4 @@

6
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,6 @@
<vc:test first-name=" " bar=" World"></vc:test>

2
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@
<h1>Hi There!</h1>

1
src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

5
src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs
View File

@ -18,6 +18,11 @@ namespace Microsoft.AspNetCore.Razor.Language
public ClassifiedSpanVisitor(RazorSourceDocument source)
{
if (source is null)
{
throw new ArgumentNullException(nameof(source));
}
_source = source;
_spans = new List<ClassifiedSpanInternal>();
_currentBlockKind = BlockKindInternal.Markup;

1
src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCSharpLoweringPhase.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
using Microsoft.AspNetCore.Razor.Language.Intermediate;

35
src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorHtmlDocument.cs Normal file
View File

@ -0,0 +1,35 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
namespace Microsoft.AspNetCore.Razor.Language
{
internal class DefaultRazorHtmlDocument : RazorHtmlDocument
{
private readonly string _generatedHtml;
private readonly RazorCodeGenerationOptions _options;
public DefaultRazorHtmlDocument(
string generatedHtml,
RazorCodeGenerationOptions options)
{
if (generatedHtml == null)
{
throw new ArgumentNullException(nameof(generatedHtml));
}
if (options == null)
{
throw new ArgumentNullException(nameof(options));
}
_generatedHtml = generatedHtml;
_options = options;
}
public override string GeneratedHtml => _generatedHtml;
public override RazorCodeGenerationOptions Options => _options;
}
}

2
src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorTagHelperBinderPhase.cs
View File

@ -102,8 +102,6 @@ namespace Microsoft.AspNetCore.Razor.Language
return string.Equals(descriptor.Name, typePattern, StringComparison.Ordinal);
}
internal abstract class DirectiveVisitor : SyntaxWalker
{
public abstract HashSet<TagHelperDescriptor> Matches { get; }

24
src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeDocumentExtensions.cs
View File

@ -3,9 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using Microsoft.AspNetCore.Razor.Language.Extensions;
using Microsoft.AspNetCore.Razor.Language.Intermediate;
@ -118,6 +115,27 @@ namespace Microsoft.AspNetCore.Razor.Language
document.Items[typeof(DocumentIntermediateNode)] = documentNode;
}
internal static RazorHtmlDocument GetHtmlDocument(this RazorCodeDocument document)
{
if (document == null)
{
throw new ArgumentNullException(nameof(document));
}
var razorHtmlObj = document.Items[typeof(RazorHtmlDocument)];
if (razorHtmlObj == null)
{
var razorHtmlDocument = RazorHtmlWriter.GetHtmlDocument(document);
if (razorHtmlDocument != null)
{
document.Items[typeof(RazorHtmlDocument)] = razorHtmlDocument;
return razorHtmlDocument;
}
}
return (RazorHtmlDocument)razorHtmlObj;
}
public static RazorCSharpDocument GetCSharpDocument(this RazorCodeDocument document)
{
if (document == null)

2
src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorEngine.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{
#pragma warning disable CS0618 // Type or member is obsolete
private static RazorEngine CreateCore(RazorConfiguration configuration, bool designTime, Action<IRazorEngineBuilder> configure)
#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning restore CS0618 // Type or member is obsolete
{
if (configuration == null)
{

29
src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlDocument.cs Normal file
View File

@ -0,0 +1,29 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
namespace Microsoft.AspNetCore.Razor.Language
{
internal abstract class RazorHtmlDocument
{
public abstract string GeneratedHtml { get; }
public abstract RazorCodeGenerationOptions Options { get; }
public static RazorHtmlDocument Create(string generatedHtml, RazorCodeGenerationOptions options)
{
if (generatedHtml == null)
{
throw new ArgumentNullException(nameof(generatedHtml));
}
if (options == null)
{
throw new ArgumentNullException(nameof(options));
}
return new DefaultRazorHtmlDocument(generatedHtml, options);
}
}
}

166
src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs Normal file
View File

@ -0,0 +1,166 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Diagnostics;
using System.Text;
using Microsoft.AspNetCore.Razor.Language.Syntax;
namespace Microsoft.AspNetCore.Razor.Language
{
// We want to generate a HTML document that contains only pure HTML.
// So we want replace all non-HTML content with whitespace.
// Ideally we should just use ClassifiedSpans to generate this document but
// not all characters in the document are included in the ClassifiedSpans.
internal class RazorHtmlWriter : SyntaxWalker
{
private bool _isHtml;
private RazorHtmlWriter(RazorSourceDocument source)
{
if (source is null)
{
throw new ArgumentNullException(nameof(source));
}
Source = source;
Builder = new StringBuilder(Source.Length);
_isHtml = true;
}
public RazorSourceDocument Source { get; }
public StringBuilder Builder { get; }
public static RazorHtmlDocument GetHtmlDocument(RazorCodeDocument codeDocument)
{
var options = codeDocument.GetCodeGenerationOptions();
if (options == null || !options.DesignTime)
{
// Not needed in run time. This pass generates the backing HTML document that is used to provide HTML intellisense.
return null;
}
var writer = new RazorHtmlWriter(codeDocument.Source);
var syntaxTree = codeDocument.GetSyntaxTree();
writer.Visit(syntaxTree.Root);
var generatedHtml = writer.Builder.ToString();
Debug.Assert(
writer.Source.Length == writer.Builder.Length,
$"The backing HTML document should be the same length as the original document. Expected: {writer.Source.Length} Actual: {writer.Builder.Length}");
var razorHtmlDocument = new DefaultRazorHtmlDocument(generatedHtml, options);
return razorHtmlDocument;
}
public override void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
{
WriteNode(node, isHtml: false, base.VisitRazorCommentBlock);
}
public override void VisitRazorMetaCode(RazorMetaCodeSyntax node)
{
WriteNode(node, isHtml: false, base.VisitRazorMetaCode);
}
public override void VisitMarkupTransition(MarkupTransitionSyntax node)
{
WriteNode(node, isHtml: false, base.VisitMarkupTransition);
}
public override void VisitCSharpTransition(CSharpTransitionSyntax node)
{
WriteNode(node, isHtml: false, base.VisitCSharpTransition);
}
public override void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
{
WriteNode(node, isHtml: false, base.VisitCSharpEphemeralTextLiteral);
}
public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
{
WriteNode(node, isHtml: false, base.VisitCSharpExpressionLiteral);
}
public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
{
WriteNode(node, isHtml: false, base.VisitCSharpStatementLiteral);
}
public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
{
WriteNode(node, isHtml: true, base.VisitMarkupStartTag);
}
public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
{
WriteNode(node, isHtml: true, base.VisitMarkupEndTag);
}
public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
{
WriteNode(node, isHtml: true, base.VisitMarkupTagHelperStartTag);
}
public override void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
{
WriteNode(node, isHtml: true, base.VisitMarkupTagHelperEndTag);
}
public override void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
{
WriteNode(node, isHtml: true, base.VisitMarkupEphemeralTextLiteral);
}
public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
{
WriteNode(node, isHtml: true, base.VisitMarkupTextLiteral);
}
public override void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
{
WriteNode(node, isHtml: true, base.VisitUnclassifiedTextLiteral);
}
public override void VisitToken(SyntaxToken token)
{
base.VisitToken(token);
WriteToken(token);
}
private void WriteToken(SyntaxToken token)
{
var content = token.Content;
if (_isHtml)
{
// If we're in HTML context, append the content directly.
Builder.Append(content);
return;
}
// We're in non-HTML context. Let's replace all non-whitespace chars with a space.
foreach (var c in content)
{
if (char.IsWhiteSpace(c))
{
Builder.Append(c);
}
else
{
Builder.Append(' ');
}
}
}
private void WriteNode<TNode>(TNode node, bool isHtml, Action<TNode> handler) where TNode : SyntaxNode
{
var old = _isHtml;
_isHtml = isHtml;
handler(node);
_isHtml = old;
}
}
}

4
src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
Pass.Engine = Engine;
}
private DefaultRazorProjectEngine ProjectEngine { get; }
private RazorEngine Engine { get; }
@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
Assert.Equal(expected, block.Content, ignoreLineEndingDifferences: true);
}
// See: https://github.com/aspnet/AspNetCore/issues/6480
// See: https://github.com/dotnet/aspnetcore/issues/6480
[Fact]
public void Execute_RewritesHtml_HtmlAttributePrefix()
{

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
View File

@ -1001,6 +1001,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
// Assert
AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
AssertHtmlDocumentMatchesBaseline(codeDocument.GetHtmlDocument());
AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
AssertSourceMappingsMatchBaseline(codeDocument);
AssertLinePragmas(codeDocument, designTime: true);

6
src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
View File

@ -5120,7 +5120,7 @@ namespace Test
CompileToAssembly(generated);
}
[Fact] // https://github.com/aspnet/Blazor/issues/597
[Fact] // https://github.com/dotnet/blazor/issues/597
public void Regression_597()
{
// Arrange
@ -5186,7 +5186,7 @@ namespace Test
CompileToAssembly(generated);
}
[Fact] // https://github.com/aspnet/Blazor/issues/772
[Fact] // https://github.com/dotnet/blazor/issues/772
public void Regression_772()
{
// Arrange
@ -5224,7 +5224,7 @@ Welcome to your new app.
d => Assert.Equal("RZ1035", d.Id));
}
[Fact] // https://github.com/aspnet/Blazor/issues/773
[Fact] // https://github.com/dotnet/blazor/issues/773
public void Regression_773()
{
// Arrange

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
View File

@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
Assert.Contains(typeof(IDoCoolThings), component.GetType().GetInterfaces());
}
[Fact] // Regression test for https://github.com/aspnet/Blazor/issues/453
[Fact] // Regression test for https://github.com/dotnet/blazor/issues/453
public void DeclarationConfiguration_FunctionsBlockHasLineMappings_MappingsApplyToError()
{
// Arrange & Act 1

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
View File

@ -23,7 +23,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(TEST_NewtonsoftJsonPackageVersion)" />
</ItemGroup>
</Project>

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/RazorProjectEngineTest.cs
View File

@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Razor.Language
feature => Assert.IsType<HtmlNodeOptimizationPass>(feature),
feature => Assert.IsType<ImplementsDirectivePass>(feature),
feature => Assert.IsType<InheritsDirectivePass>(feature),
feature => Assert.IsType<MetadataAttributePass>(feature),
feature => Assert.IsType<MetadataAttributePass>(feature),
feature => Assert.IsType<PreallocatedTagHelperAttributeOptimizationPass>(feature));
}

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

6
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,6 @@
Hello World

26
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,26 @@
<section>
<h1>Basic Asynchronous Expression Test</h1>
<p>Basic Asynchronous Expression: </p>
<p>Basic Asynchronous Template: </p>
<p>Basic Asynchronous Statement: </p>
<p>Basic Asynchronous Statement Nested: <b> </b> </p>
<p>Basic Incomplete Asynchronous Statement: </p>
</section>
<section>
<h1>Advanced Asynchronous Expression Test</h1>
<p>Advanced Asynchronous Expression: </p>
<p>Advanced Asynchronous Expression Extended: </p>
<p>Advanced Asynchronous Template: </p>
<p>Advanced Asynchronous Statement: </p>
<p>Advanced Asynchronous Statement Extended: </p>
<p>Advanced Asynchronous Statement Nested: <b> </b> </p>
<p>Advanced Incomplete Asynchronous Statement: </p>
</section>

37
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,37 @@
<p>Hello from C#, # </p>
<p>We wrote 10 lines!</p>
<p>No really, we wrote 10 lines!</p>
<p>Actually, we didn't...</p>
<p>Hello again from C#, # </p>
<p>That time, we wrote 5 lines!</p>
<p>Oh no! An error occurred: </p>
<p>i is now </p>
<p>This block is locked, for your security!</p>

43
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,43 @@
<body>
<p>
Here's a very unique number:
</p>
<div>
</div>
</body>

67
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,67 @@

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

4
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,4 @@
<text>foo</text>
<text>bar </text>

5
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,5 @@

15
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,15 @@
<a href="Foo" />
<p class=" " />
<p class="foo " />
<p class=" foo" />
<input type="checkbox" checked=" " />
<input type="checkbox" checked="foo " />
<p class=" " />
<a href="~/Foo" />
<script src=" " type="text/javascript"></script>
<script src=" " type="text/javascript"></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>

15
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,15 @@
<div>
<p>This is item # </p>
</div>
<p>
<p>Bar Biz</p>
</p>
<p>Foo</p>

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
This is markup

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
This is markup

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
This is markup
!

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
This is markup

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@
<div> </div>

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@
1 + 1 =

16
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,16 @@
<p>Foo is Null!</p>
<p>
</p>

7
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,7 @@

12
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,12 @@
Here's a random number:

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@
<!-- " -->
<img src="~/images/submit.png" />

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,2 @@
<!-- ' -->
<img src="~/images/submit.png" />

5
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,5 @@

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
This is markup

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
<p>This is item # </p>

25
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,25 @@
{

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@
(string link) {
<a href=" <text>#</text> " />
}

38
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,38 @@
<p>Bar</p>
Hello, World
<p>Hello, World</p>
<p>Hello from C#, # </p>
<p>We wrote 10 lines!</p>
<p>No really, we wrote 10 lines!</p>
<p>Actually, we didn't...</p>
<p>Hello again from C#, # </p>
<p>That time, we wrote 5 lines!</p>
<p>Oh no! An error occurred: </p>
<p>This block is locked, for your security!</p>

5
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,5 @@
<p>Hello from C#, # </p>

45
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,45 @@
<div> </div>
<div>
<h3>Happy birthday !</h3>
</div>
<ul>
<li> Happy birthday!</li>
</ul>
<h4>Secret message</h4>

8
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,8 @@
<div>
.
</div>

4
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,4 @@

38
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,38 @@
<p>Hello from C#, # </p>
<p>We wrote 10 lines!</p>
<p>No really, we wrote 10 lines!</p>
<p>Actually, we didn't...</p>
<p>Hello again from C#, # </p>
<p>That time, we wrote 5 lines!</p>
<p>Oh no! An error occurred: </p>
<p>i is now </p>
<p>This block is locked, for your security!</p>

11
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,11 @@

5
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,5 @@
<html>
<body>
</body>
</html>

5
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,5 @@

18
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,18 @@
<p>This should be shown</p>
<p>But this should show the comment syntax: </p>
<input value="@*this razor comment is the actual value*@" type="text" />
<input type="text" />

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html Normal file
View File

@ -0,0 +1 @@

17
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,17 @@
<div>This is in the Body>
<div class="some ">This is in Section 2</div>
<div>This is in Section 1</div>
<span> </span>

4
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,4 @@
<div></div>

102
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,102 @@
<p>Before Text</p>
<p>Hello!</p>
<p>The time is </p>
<p>After Text</p>

237
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,237 @@
<p>This is line 1</p>
<p>This is line 2</p>
<p>This is line 3</p>
<p>This is line 4</p>
<p>This is line 5</p>
<p>This is line 6</p>
<p>This is line 7</p>
<p>This is line 8</p>
<p>This is line 9</p>
<p>This is line 10</p>
<p>This is line 11</p>
<p>This is line 12</p>
<p>This is line 13</p>
<p>This is line 14</p>
<p>This is line 15</p>
<p>This is line 16</p>
<p>This is line 17</p>
<p>This is line 18</p>
<p>This is line 19</p>
<p>This is line 20</p>
<p>This is line 21</p>
<p>This is line 22</p>
<p>This is line 23</p>
<p>This is line 24</p>
<p>This is line 25</p>
<p>This is line 26</p>
<p>This is line 27</p>
<p>This is line 28</p>
<p>This is line 29</p>
<p>This is line 30</p>
<p>This is line 31</p>
<p>This is line 32</p>
<p>This is line 33</p>
<p>This is line 34</p>
<p>This is line 35</p>
<p>This is line 36</p>
<p>This is line 37</p>
<p>This is line 38</p>
<p>This is line 39</p>
<p>This is line 40</p>
<p>This is line 41</p>
<p>This is line 42</p>
<p>This is line 43</p>
<p>This is line 44</p>
<p>This is line 45</p>
<p>This is line 46</p>
<p>This is line 47</p>
<p>This is line 48</p>
<p>This is line 49</p>
<p>This is line 50</p>
<p>This is line 51</p>
<p>This is line 52</p>
<p>This is line 53</p>
<p>This is line 54</p>
<p>This is line 55</p>
<p>This is line 56</p>
<p>This is line 57</p>
<p>This is line 58</p>
<p>This is line 59</p>
<p>This is line 60</p>
<p>This is line 61</p>
<p>This is line 62</p>
<p>This is line 63</p>
<p>This is line 64</p>
<p>This is line 65</p>
<p>This is line 66</p>
<p>This is line 67</p>
<p>This is line 68</p>
<p>This is line 69</p>
<p>This is line 70</p>
<p>This is line 71</p>
<p>This is line 72</p>
<p>This is line 73</p>
<p>This is line 74</p>
<p>This is line 75</p>
<p>This is line 76</p>
<p>This is line 77</p>
<p>This is line 78</p>
<p>This is line 79</p>
<p>This is line 80</p>
<p>This is line 81</p>
<p>This is line 82</p>
<p>This is line 83</p>
<p>This is line 84</p><br>
<p>This is line 1 nested</p>
<p>This is line 2 nested</p>
<p>This is line 3 nested</p>
<p>This is line 4 nested</p>
<p>This is line 5 nested</p>
<p>This is line 6 nested</p>
<p>This is line 7 nested</p>
<p>This is line 8 nested</p>
<p>This is line 9 nested</p>
<p>This is line 10 nested</p>
<p>This is line 11 nested</p>
<p>This is line 12 nested</p>
<p>This is line 13 nested</p>
<p>This is line 14 nested</p>
<p>This is line 15 nested</p>
<p>This is line 16 nested</p>
<p>This is line 17 nested</p>
<p>This is line 18 nested</p>
<p>This is line 19 nested</p>
<p>This is line 20 nested</p>
<p>This is line 21 nested</p>
<p>This is line 22 nested</p>
<p>This is line 23 nested</p>
<p>This is line 24 nested</p>
<p>This is line 25 nested</p>
<p>This is line 26 nested</p>
<p>This is line 27 nested</p>
<p>This is line 28 nested</p>
<p>This is line 29 nested</p>
<p>This is line 30 nested</p>
<p>This is line 31 nested</p>
<p>This is line 32 nested</p>
<p>This is line 33 nested</p>
<p>This is line 34 nested</p>
<p>This is line 35 nested</p>
<p>This is line 36 nested</p>
<p>This is line 37 nested</p>
<p>This is line 38 nested</p>
<p>This is line 39 nested</p>
<p>This is line 40 nested</p>
<p>This is line 41 nested</p>
<p>This is line 42 nested</p>
<p>This is line 43 nested</p>
<p>This is line 44 nested</p>
<p>This is line 45 nested</p>
<p>This is line 46 nested</p>
<p>This is line 47 nested</p>
<p>This is line 48 nested</p>
<p>This is line 49 nested</p>
<p>This is line 50 nested</p>
<p>This is line 51 nested</p>
<p>This is line 52 nested</p>
<p>This is line 53 nested</p>
<p>This is line 54 nested</p>
<p>This is line 55 nested</p>
<p>This is line 56 nested</p>
<p>This is line 57 nested</p>
<p>This is line 58 nested</p>
<p>This is line 59 nested</p>
<p>This is line 60 nested</p>
<p>This is line 61 nested</p>
<p>This is line 62 nested</p>
<p>This is line 63 nested</p>
<p>This is line 64 nested</p>
<p>This is line 65 nested</p>
<p>This is line 66 nested</p>
<p>This is line 67 nested</p>
<p>This is line 68 nested</p>
<p>This is line 69 nested</p>
<p>This is line 70 nested</p>
<p>This is line 71 nested</p>
<p>This is line 72 nested</p>
<p>This is line 73 nested</p>
<p>This is line 74 nested</p>
<p>This is line 75 nested</p>
<p>This is line 1</p>
<p>This is line 2</p>
<p>This is line 3</p>
<p>This is line 4</p>
<p>This is line 5</p>
<p>This is line 6</p>
<p>This is line 7</p>
<p>This is line 8</p>
<p>This is line 9</p>
<p>This is line 10</p>
<p>This is line 11</p>
<p>This is line 12</p>
<p>This is line 13</p>
<p>This is line 14</p>
<p>This is line 15</p>
<p>This is line 16</p>
<p>This is line 17</p>
<p>This is line 18</p>
<p>This is line 19</p>
<p>This is line 20</p>
<p>This is line 21</p>
<p>This is line 22</p>
<p>This is line 23</p>
<p>This is line 24</p>
<p>This is line 25</p>
<p>This is line 26</p>
<p>This is line 27</p>
<p>This is line 28</p>
<p>This is line 29</p>
<p>This is line 30</p>
<p>This is line 31</p>
<p>This is line 32</p>
<p>This is line 33</p>
<p>This is line 34</p>
<p>This is line 35</p>
<p>This is line 36</p>
<p>This is line 37</p>
<p>This is line 38</p>
<p>This is line 39</p>
<p>This is line 40</p>
<p>This is line 41</p>
<p>This is line 42</p>
<p>This is line 43</p>hi!
<p>This is line 1 nested</p>
<p>This is line 2 nested</p>
<p>This is line 3 nested</p>
<p>This is line 4 nested</p>
<p>This is line 5 nested</p>
<p>This is line 6 nested</p>
<p>This is line 7 nested</p>
<p>This is line 8 nested</p>
<p>This is line 9 nested</p>
<p>This is line 10 nested</p>
<p>This is line 11 nested</p>
<p>This is line 12 nested</p>
<p>This is line 13 nested</p>
<p>This is line 14 nested</p>
<p>This is line 15 nested</p>
<p>This is line 16 nested</p>
<p>This is line 17 nested</p>
<p>This is line 18 nested</p>
<p>This is line 19 nested</p>
<p>This is line 20 nested</p>
<p>This is line 21 nested</p>
<p>This is line 22 nested</p>
<p>This is line 23 nested</p>
<p>This is line 24 nested</p>
<p>This is line 25 nested</p>
<p>This is line 26 nested</p>
<p>This is line 27 nested</p>
<p>This is line 28 nested</p>
<p>This is line 29 nested</p>
<p>30</p>
!

9
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,9 @@
<script type="text/javascript" ></script @foo >
<script type="text/html">
<%var x = window == null%>
</script>
<script></script @

53
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,53 @@
<text>This works !</text>
<p class=" ">Hello</p>
<ul>
<li>Item # </li>
</ul>
<p>
This is line# of markup<br/>
</p>
<p>
: This is line# of markup<br />
</p>
<p>
:: This is line# of markup<br />
</p>
<ul>
<li>
Item #
<ul>
<li>Child Items... ?</li>
</ul>
</li>
</ul>

3
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,3 @@

15
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html Normal file
View File

@ -0,0 +1,15 @@
<p>Path's full type name is </p>
<p>Foo's actual full type name is </p>

2
src/Razor/Microsoft.AspNetCore.Razor.Tools/src/Microsoft.AspNetCore.Razor.Tools.csproj
View File

@ -7,7 +7,7 @@
This is intentionally targeting netcoreapp3.0. This allows using the Microsoft.NET.Sdk.Razor package without having to solve diamond dependency problems in AspNetCore.
We use a runtimeconfig.json.template to allow roll forwards.
In addition, the SDK stamps an exact version of the shared fx to use in all runtimeconfig.json that are contained in the SDK.
See the discussion here: https://github.com/aspnet/AspNetCore-Internal/issues/3201#issuecomment-539631557
See the discussion here: https://github.com/dotnet/aspnetcore-internal/issues/3201#issuecomment-539631557
-->
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType>

2
src/Razor/Microsoft.AspNetCore.Razor.Tools/test/DefaultExtensionAssemblyLoaderTest.cs
View File

@ -121,7 +121,7 @@ Delta: Gamma: Beta: Test B
var actual = builder.ToString();
Assert.Equal(expected, actual);
Assert.Equal(expected, actual, ignoreLineEndingDifferences: true);
}
}
}

6
src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
View File

@ -235,7 +235,7 @@ namespace Microsoft.CodeAnalysis.Razor
// We need to check the constructor argument length here, because this can show up as 0
// if the language service fails to initialize. This is an invalid case, so skip it.
if (Equals(attribute.AttributeClass, bindElement) && attribute.ConstructorArguments.Length == 4)
if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, bindElement) && attribute.ConstructorArguments.Length == 4)
{
results.Add(new ElementBindData(
type.ContainingAssembly.Name,
@ -246,7 +246,7 @@ namespace Microsoft.CodeAnalysis.Razor
(string)attribute.ConstructorArguments[2].Value,
(string)attribute.ConstructorArguments[3].Value));
}
else if (Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 4)
else if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 4)
{
results.Add(new ElementBindData(
type.ContainingAssembly.Name,
@ -257,7 +257,7 @@ namespace Microsoft.CodeAnalysis.Razor
(string)attribute.ConstructorArguments[2].Value,
(string)attribute.ConstructorArguments[3].Value));
}
else if (Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 6)
else if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, bindInputElement) && attribute.ConstructorArguments.Length == 6)
{
results.Add(new ElementBindData(
type.ContainingAssembly.Name,

Some files were not shown because too many files have changed in this diff Show More