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

Merge pull request dotnet/aspnetcore-tooling#1154 from dotnet-maestro-bot/merge/release/3.1-to-master 

[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 04146ad860
This commit is contained in:
Javier Calvarro Nelson 2019-09-20 11:36:32 +02:00 committed by GitHub
parent 8d0881794a dfbb36ee10
commit 228f8f878a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildProcessManager.cs
View File

@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
.GetCustomAttributes<AssemblyMetadataAttribute>(); .GetCustomAttributes<AssemblyMetadataAttribute>();
var procDumpPath = metadataAttributes var procDumpPath = metadataAttributes
.SingleOrDefault(ama => ama.Key == "ProcDumpPath")?.Value; .SingleOrDefault(ama => ama.Key == "ProcDumpToolPath")?.Value;
if (string.IsNullOrEmpty(procDumpPath)) if (string.IsNullOrEmpty(procDumpPath))
{ {

4
src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
View File

@ -45,7 +45,7 @@
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute"> <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
<_Parameter1>ArtifactsLogDir</_Parameter1> <_Parameter1>ArtifactsLogDir</_Parameter1>
<_Parameter2>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfiguration)'))</_Parameter2> <_Parameter2>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfig)'))</_Parameter2>
</AssemblyAttribute> </AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute"> <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
</Target> </Target>
<Target Name="EnsureLogFolder" AfterTargets="Build"> <Target Name="EnsureLogFolder" AfterTargets="Build">
<MakeDir Directories="$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfiguration)'))" /> <MakeDir Directories="$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'log', '$(_BuildConfig)'))" />
</Target> </Target>
</Project> </Project>