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

Merge pull request #7771 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2 

[automated] Merge branch 'release/2.1' => 'release/2.2'
This commit is contained in:
Pranav K 2019-02-20 16:28:35 -08:00 committed by GitHub
parent fbe49b396b b2a84b7b5f
commit 82c323f599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs
View File

@ -23,8 +23,7 @@ namespace FunctionalTests
if (!string.Equals(expected, normalizedContent, System.StringComparison.Ordinal)) if (!string.Equals(expected, normalizedContent, System.StringComparison.Ordinal))
{ {
var solutionRoot = ApplicationPaths.SolutionDirectory; var solutionRoot = ApplicationPaths.SolutionDirectory;
var projectName = typeof(TestEmbeddedResource).GetTypeInfo().Assembly.GetName().Name; var fullPath = Path.Combine(solutionRoot, "ViewCompilation", "test", "FunctionalTests", "Resources", resourceFile);
var fullPath = Path.Combine(solutionRoot, "test", ProjectName, "Resources", resourceFile);
lock (_writeLock) lock (_writeLock)
{ {
// Write content to the file, creating it if necessary. // Write content to the file, creating it if necessary.