Merge in 'release/2.1' changes

dotnet-bot · dotnet-bot · commit f5b36aa8f249 · 2018-12-13T01:15:45.000Z
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs
@@ -21,7 +21,7 @@ public class ResponseCachingTests
 
         public ResponseCachingTests()
         {
-            _absoluteFilePath = Directory.GetFiles(Directory.GetCurrentDirectory()).First();
+            _absoluteFilePath = Path.Combine(Directory.GetCurrentDirectory(), "Microsoft.AspNetCore.Server.HttpSys.dll");
             _fileLength = new FileInfo(_absoluteFilePath).Length;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ResponseCachingTests`
`21`	`21`
`22`	`22`	`public ResponseCachingTests()`
`23`	`23`	`{`
`24`		`- _absoluteFilePath = Directory.GetFiles(Directory.GetCurrentDirectory()).First();`
	`24`	`+ _absoluteFilePath = Path.Combine(Directory.GetCurrentDirectory(), "Microsoft.AspNetCore.Server.HttpSys.dll");`
`25`	`25`	`_fileLength = new FileInfo(_absoluteFilePath).Length;`
`26`	`26`	`}`
`27`	`27`