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

Fix nullable warning in IntegrationTestBase (#22487)

This commit is contained in:
Brennan 2020-06-03 07:48:35 -07:00 committed by GitHub
parent d8733c2a55
commit 381ac51af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -117,7 +119,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
{ {
} }
protected CSharpSyntaxTree AddCSharpSyntaxTree(string text, string filePath = null) protected CSharpSyntaxTree AddCSharpSyntaxTree(string text, string? filePath = null)
{ {
var syntaxTree = (CSharpSyntaxTree)CSharpSyntaxTree.ParseText(text, CSharpParseOptions, path: filePath); var syntaxTree = (CSharpSyntaxTree)CSharpSyntaxTree.ParseText(text, CSharpParseOptions, path: filePath);
CSharpSyntaxTrees.Add(syntaxTree); CSharpSyntaxTrees.Add(syntaxTree);
@ -164,7 +166,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
return projectItem; return projectItem;
} }
protected RazorProjectItem CreateProjectItemFromFile(string filePath = null, string fileKind = null) protected RazorProjectItem CreateProjectItemFromFile(string? filePath = null, string? fileKind = null)
{ {
if (FileName == null) if (FileName == null)
{ {
@ -297,14 +299,14 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
return compilation; return compilation;
} }
protected RazorProjectEngine CreateProjectEngine(Action<RazorProjectEngineBuilder> configure = null) protected RazorProjectEngine CreateProjectEngine(Action<RazorProjectEngineBuilder>? configure = null)
{ {
var compilation = CreateCompilation(); var compilation = CreateCompilation();
var references = compilation.References.Concat(new[] { compilation.ToMetadataReference(), }).ToArray(); var references = compilation.References.Concat(new[] { compilation.ToMetadataReference(), }).ToArray();
return CreateProjectEngine(Configuration, references, configure); return CreateProjectEngine(Configuration, references, configure);
} }
private RazorProjectEngine CreateProjectEngine(RazorConfiguration configuration, MetadataReference[] references, Action<RazorProjectEngineBuilder> configure) private RazorProjectEngine CreateProjectEngine(RazorConfiguration configuration, MetadataReference[] references, Action<RazorProjectEngineBuilder>? configure)
{ {
return RazorProjectEngine.Create(configuration, FileSystem, b => return RazorProjectEngine.Create(configuration, FileSystem, b =>
{ {