Merge branch 'master' into use-format-diagnostic

src/compiler/program.ts

@@ -994,6 +994,7 @@ namespace ts {
     export interface FormatDiagnosticsHost {
         getCurrentDirectory(): string;
         getCanonicalFileName(fileName: string): string;
+        getNewLine(): string;
     }
 
     export function formatDiagnostics(diagnostics: Diagnostic[], host: FormatDiagnosticsHost): string {

src/harness/harness.ts

@@ -1210,7 +1210,7 @@ namespace Harness {
         }
 
         export function minimalDiagnosticsToString(diagnostics: ts.Diagnostic[]) {
-            return ts.formatDiagnostics(diagnostics, {getCanonicalFileName, getCurrentDirectory: () => ""});
+            return ts.formatDiagnostics(diagnostics, {getCanonicalFileName, getCurrentDirectory: () => "", getNewLine: () => Harness.IO.newLine()});
         }
 
         export function getErrorBaseline(inputFiles: TestFile[], diagnostics: ts.Diagnostic[]) {