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

RazorSDK doesn't overwrite ErrorLog 

\n\nCommit migrated from aed7bc8ec6
This commit is contained in:
Ryan Brandenburg 2019-09-25 14:17:10 -07:00
parent c05fca5137
commit eda9503177
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ Copyright (c) .NET Foundation. All rights reserved.
Remove comment above ^ Remove comment above ^
Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll Set TargetType="$(OutputType)" to TargetType="Library" - Razor is always a .dll
Remove Returns="@(CscCommandLineArgs)" Remove Returns="@(CscCommandLineArgs)"
Remove <Import Project="Microsoft.Managed.Core.targets"/> Remove <Import Project="Microsoft.Managed.Core.targets"/>
Remove Returns="@(CscCommandLineArgs)" Remove Returns="@(CscCommandLineArgs)"
@ -60,7 +60,7 @@ Copyright (c) .NET Foundation. All rights reserved.
Remove additional steps after calling CSC Remove additional steps after calling CSC
Add our FileWrites after the call to CSC Add our FileWrites after the call to CSC
Add Condition="'@(RazorCompile)'!=''" as a condition to the RazorCoreCompile target. Add Condition="'@(RazorCompile)'!=''" as a condition to the RazorCoreCompile target.
--> -->
<Target Name="RazorCoreCompile" <Target Name="RazorCoreCompile"
@ -117,6 +117,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion> <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<RazorCompilationErrorLog Condition="'$(RazorCompilationErrorLog)'==''">$(IntermediateOutputPath)$(RazorTargetName).Compilation.log</RazorCompilationErrorLog>
</PropertyGroup>
<Csc <Csc
AdditionalLibPaths="$(AdditionalLibPaths)" AdditionalLibPaths="$(AdditionalLibPaths)"
AddModules="@(AddModules)" AddModules="@(AddModules)"
@ -137,7 +141,7 @@ Copyright (c) .NET Foundation. All rights reserved.
EmitDebugInformation="$(DebugSymbols)" EmitDebugInformation="$(DebugSymbols)"
EnvironmentVariables="$(CscEnvironment)" EnvironmentVariables="$(CscEnvironment)"
ErrorEndLocation="$(ErrorEndLocation)" ErrorEndLocation="$(ErrorEndLocation)"
ErrorLog="$(ErrorLog)" ErrorLog="$(RazorCompilationErrorLog)"
ErrorReport="$(ErrorReport)" ErrorReport="$(ErrorReport)"
Features="$(Features)" Features="$(Features)"
FileAlignment="$(FileAlignment)" FileAlignment="$(FileAlignment)"

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

@ -180,6 +180,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<UseSharedCompilation>true</UseSharedCompilation> <UseSharedCompilation>true</UseSharedCompilation>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<RazorComponentErrorLog Condition="'$(RazorComponentErrorLog)'==''"><$(IntermediateOutputPath)$(RazorTargetName).Component.log/RazorComponentErrorLog>
</PropertyGroup>
<Csc <Csc
AdditionalLibPaths="$(AdditionalLibPaths)" AdditionalLibPaths="$(AdditionalLibPaths)"
AddModules="@(AddModules)" AddModules="@(AddModules)"
@ -198,7 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved.
EmitDebugInformation="$(DebugSymbols)" EmitDebugInformation="$(DebugSymbols)"
EnvironmentVariables="$(CscEnvironment)" EnvironmentVariables="$(CscEnvironment)"
ErrorEndLocation="$(ErrorEndLocation)" ErrorEndLocation="$(ErrorEndLocation)"
ErrorLog="$(ErrorLog)" ErrorLog="$(RazorComponentErrorLog)"
ErrorReport="$(ErrorReport)" ErrorReport="$(ErrorReport)"
Features="$(Features)" Features="$(Features)"
FileAlignment="$(FileAlignment)" FileAlignment="$(FileAlignment)"
@ -265,10 +269,10 @@ Copyright (c) .NET Foundation. All rights reserved.
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<!-- <!--
Once RazorCompileComponentDeclaration is completed, we have all the inputs required for code generation of Once RazorCompileComponentDeclaration is completed, we have all the inputs required for code generation of
RazorComponents and RazorGenerate items. We'll initialize the inputs for RazorGenerate and invoke it. RazorComponents and RazorGenerate items. We'll initialize the inputs for RazorGenerate and invoke it.
This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as
part of PrepareForRun \ PrepareForPublish for non-components (.cshtml) files. part of PrepareForRun \ PrepareForPublish for non-components (.cshtml) files.
--> -->
<Target <Target