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

React to Roslyn rename of `NullableContextOptions` to `Nullable`. 

- Verified the fix with VS16.2-preview2 + latest CLI with modified `Nullable` entry on disk
- Updated tests.
- Note: This change will not pass the build until we have a new CLI that has an updated Roslyn that understands `Nullable`.

aspnet/AspNetCoredotnet/aspnetcore-tooling#10218
\n\nCommit migrated from fee9c35bee
This commit is contained in:
N. Taylor Mullen 2019-05-13 21:23:50 -07:00
parent fde8f98d7e
commit b724885f38
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
View File

@ -153,7 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved.
NoLogo="$(NoLogo)" NoLogo="$(NoLogo)"
NoStandardLib="$(NoCompilerStandardLib)" NoStandardLib="$(NoCompilerStandardLib)"
NoWin32Manifest="$(NoWin32Manifest)" NoWin32Manifest="$(NoWin32Manifest)"
NullableContextOptions="$(NullableContextOptions)" Nullable="$(Nullable)"
Optimize="$(Optimize)" Optimize="$(Optimize)"
Deterministic="$(Deterministic)" Deterministic="$(Deterministic)"
PublicSign="$(PublicSign)" PublicSign="$(PublicSign)"

2
src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
View File

@ -220,7 +220,7 @@ Copyright (c) .NET Foundation. All rights reserved.
NoLogo="$(NoLogo)" NoLogo="$(NoLogo)"
NoStandardLib="$(NoCompilerStandardLib)" NoStandardLib="$(NoCompilerStandardLib)"
NoWin32Manifest="$(NoWin32Manifest)" NoWin32Manifest="$(NoWin32Manifest)"
NullableContextOptions="$(NullableContextOptions)" Nullable="$(Nullable)"
Optimize="$(Optimize)" Optimize="$(Optimize)"
Deterministic="$(Deterministic)" Deterministic="$(Deterministic)"
PublicSign="$(PublicSign)" PublicSign="$(PublicSign)"

4
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
View File

@ -629,7 +629,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
{ {
var result = await DotnetMSBuild( var result = await DotnetMSBuild(
"Build", "Build",
"/p:LangVersion=8.0 /p:NullableContextOptions=enable"); "/p:LangVersion=8.0 /p:Nullable=enable");
var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs"); var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
Assert.BuildPassed(result, allowWarnings: true); Assert.BuildPassed(result, allowWarnings: true);
@ -644,7 +644,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
{ {
var result = await DotnetMSBuild( var result = await DotnetMSBuild(
"Build", "Build",
"/p:LangVersion=8.0 /p:NullableContextOptions=enable", "/p:LangVersion=8.0 /p:Nullable=enable",
suppressBuildServer: true); suppressBuildServer: true);
var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs"); var indexFilePath = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");