diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 2caf35ce786..1a3eaa5bd17 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -446,7 +446,8 @@ namespace ts {
         }
     }
 
-    function getBuildInfoText(buildInfo: BuildInfo) {
+    /*@internal*/
+    export function getBuildInfoText(buildInfo: BuildInfo) {
         return JSON.stringify(buildInfo, undefined, 2);
     }
 
diff --git a/src/harness/fakes.ts b/src/harness/fakes.ts
index ac19ac3a6a6..a541a518379 100644
--- a/src/harness/fakes.ts
+++ b/src/harness/fakes.ts
@@ -385,7 +385,68 @@ namespace fakes {
     }
 
     export class SolutionBuilderHost extends CompilerHost implements ts.SolutionBuilderHost<ts.BuilderProgram> {
-        createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        createProgram(rootNames: ReadonlyArray<string> | undefined, options: ts.CompilerOptions | undefined, host?: CompilerHost, oldProgram?: ts.EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<ts.Diagnostic>, projectReferences?: ReadonlyArray<ts.ProjectReference> | undefined) {
+            const program = ts.createEmitAndSemanticDiagnosticsBuilderProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+            const originalGetProgramBuildInfo = program.getProgramBuildInfo.bind(program);
+            program.getProgramBuildInfo = () => {
+                const program = originalGetProgramBuildInfo() as ts.ProgramBuildInfo | undefined;
+                if (!program) return program;
+                // Fix lib signatures
+                for (const path of ts.getOwnKeys(program.fileInfos)) {
+                    if (ts.startsWith(path, "/lib/")) {
+                        const currentValue = program.fileInfos[path];
+                        ts.Debug.assert(currentValue.signature === currentValue.version);
+                        program.fileInfos[path] = { version: path, signature: path };
+                    }
+                }
+
+                // reference Map
+                if (program.referencedMap) {
+                    const referencedMap: ts.MapLike<string[]> = {};
+                    for (const path of ts.getOwnKeys(program.referencedMap).sort()) {
+                        referencedMap[path] = program.referencedMap[path].sort();
+                    }
+                    program.referencedMap = referencedMap;
+                }
+
+                // exportedModulesMap
+                if (program.exportedModulesMap) {
+                    const exportedModulesMap: ts.MapLike<string[]> = {};
+                    for (const path of ts.getOwnKeys(program.exportedModulesMap).sort()) {
+                        exportedModulesMap[path] = program.exportedModulesMap[path].sort();
+                    }
+                    program.exportedModulesMap = exportedModulesMap;
+                }
+
+                // semanticDiagnosticsPerFile
+                if (program.semanticDiagnosticsPerFile) {
+                    program.semanticDiagnosticsPerFile.sort();
+                }
+
+                return program;
+            };
+            return program;
+        }
+
+        readFile(path: string) {
+            const value = super.readFile(path);
+            if (!value || !ts.isBuildInfoFile(path)) return value;
+            const buildInfo = JSON.parse(value) as ts.BuildInfo;
+            if (!buildInfo.program) return value;
+            // Fix lib signatures
+            for (const path of ts.getOwnKeys(buildInfo.program.fileInfos)) {
+                if (ts.startsWith(path, "/lib/")) {
+                    const currentValue = buildInfo.program.fileInfos[path];
+                    ts.Debug.assert(currentValue.signature === path);
+                    ts.Debug.assert(currentValue.signature === currentValue.version);
+                    const text = super.readFile(path)!;
+                    const signature = ts.generateDjb2Hash(text);
+                    buildInfo.program.fileInfos[path] = { version: signature, signature };
+                }
+            }
+            return ts.getBuildInfoText(buildInfo);
+        }
+
         now() {
             return new Date(this.sys.vfs.time());
         }
diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/sample.js
index 58048f0793b..fee1115c61c 100644
--- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/sample.js
+++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/sample.js
@@ -3,24 +3,24 @@
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/anothermodule.ts": {
         "version": "-2676574883",
@@ -46,13 +46,13 @@
     "exportedModulesMap": {},
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
-      "/src/core/some_decl.d.ts",
-      "/src/core/index.ts"
+      "/src/core/index.ts",
+      "/src/core/some_decl.d.ts"
     ]
   }
 }
@@ -231,24 +231,24 @@ export class someClass { }
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-2069755619",
@@ -273,8 +273,8 @@ export class someClass { }
     },
     "referencedMap": {
       "/src/logic/index.ts": [
-        "/src/core/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/core/anothermodule.d.ts",
+        "/src/core/index.d.ts"
       ]
     },
     "exportedModulesMap": {
@@ -284,10 +284,10 @@ export class someClass { }
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
       "/src/core/index.ts",
       "/src/logic/index.ts"
@@ -300,24 +300,24 @@ export class someClass { }
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-2069755619",
@@ -348,9 +348,9 @@ export class someClass { }
         "/src/core/anothermodule.d.ts"
       ],
       "/src/tests/index.ts": [
+        "/src/core/anothermodule.d.ts",
         "/src/core/index.d.ts",
-        "/src/logic/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/logic/index.d.ts"
       ]
     },
     "exportedModulesMap": {
@@ -363,13 +363,13 @@ export class someClass { }
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
-      "/src/logic/index.ts",
       "/src/core/index.ts",
+      "/src/logic/index.ts",
       "/src/tests/index.ts"
     ]
   }
diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/when-logic-config-changes-declaration-dir.js
index f4f363e62e7..6987e5776c2 100644
--- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/when-logic-config-changes-declaration-dir.js
+++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/buildInfo/when-logic-config-changes-declaration-dir.js
@@ -3,24 +3,24 @@
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-13851440507",
@@ -46,8 +46,8 @@
     },
     "referencedMap": {
       "/src/logic/index.ts": [
-        "/src/core/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/core/anothermodule.d.ts",
+        "/src/core/index.d.ts"
       ]
     },
     "exportedModulesMap": {
@@ -57,12 +57,12 @@
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
-      "/src/core/index.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
+      "/src/core/index.ts",
       "/src/logic/index.ts"
     ]
   }
@@ -95,24 +95,24 @@ export declare const m: typeof mod;
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-13851440507",
@@ -143,9 +143,9 @@ export declare const m: typeof mod;
         "/src/core/anothermodule.d.ts"
       ],
       "/src/tests/index.ts": [
+        "/src/core/anothermodule.d.ts",
         "/src/core/index.d.ts",
-        "/src/logic/decls/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/logic/decls/index.d.ts"
       ]
     },
     "exportedModulesMap": {
@@ -158,12 +158,12 @@ export declare const m: typeof mod;
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
-      "/src/core/index.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
+      "/src/core/index.ts",
       "/src/logic/index.ts",
       "/src/tests/index.ts"
     ]
diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/buildInfo/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/buildInfo/sample.js
index e75a9b52f78..c9b8b2eb49b 100644
--- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/buildInfo/sample.js
+++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/buildInfo/sample.js
@@ -3,24 +3,24 @@
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/anothermodule.ts": {
         "version": "-2676574883",
@@ -46,13 +46,13 @@
     "exportedModulesMap": {},
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
-      "/src/core/some_decl.d.ts",
-      "/src/core/index.ts"
+      "/src/core/index.ts",
+      "/src/core/some_decl.d.ts"
     ]
   }
 }
diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/sample.js
index 785a20e2379..1d4d718b29d 100644
--- a/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/sample.js
+++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/sample.js
@@ -3,24 +3,24 @@
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/anothermodule.ts": {
         "version": "-2676574883",
@@ -46,10 +46,10 @@
     "exportedModulesMap": {},
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
       "/src/core/index.ts",
       "/src/core/some_decl.d.ts"
@@ -244,24 +244,24 @@ exports.multiply = multiply;
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-13851440507",
@@ -286,8 +286,8 @@ exports.multiply = multiply;
     },
     "referencedMap": {
       "/src/logic/index.ts": [
-        "/src/core/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/core/anothermodule.d.ts",
+        "/src/core/index.d.ts"
       ]
     },
     "exportedModulesMap": {
@@ -297,12 +297,12 @@ exports.multiply = multiply;
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
-      "/src/core/index.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
+      "/src/core/index.ts",
       "/src/logic/index.ts"
     ]
   }
@@ -458,24 +458,24 @@ sourceFile:index.ts
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-13851440507",
@@ -506,27 +506,27 @@ sourceFile:index.ts
         "/src/core/anothermodule.d.ts"
       ],
       "/src/tests/index.ts": [
+        "/src/core/anothermodule.d.ts",
         "/src/core/index.d.ts",
-        "/src/logic/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/logic/index.d.ts"
       ]
     },
     "exportedModulesMap": {
-      "/src/tests/index.ts": [
+      "/src/logic/index.ts": [
         "/src/core/anothermodule.d.ts"
       ],
-      "/src/logic/index.ts": [
+      "/src/tests/index.ts": [
         "/src/core/anothermodule.d.ts"
       ]
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
-      "/src/core/index.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
+      "/src/core/index.ts",
       "/src/logic/index.ts",
       "/src/tests/index.ts"
     ]
diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/when-logic-config-changes-declaration-dir.js
index 785a20e2379..1d4d718b29d 100644
--- a/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/when-logic-config-changes-declaration-dir.js
+++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/buildInfo/when-logic-config-changes-declaration-dir.js
@@ -3,24 +3,24 @@
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/anothermodule.ts": {
         "version": "-2676574883",
@@ -46,10 +46,10 @@
     "exportedModulesMap": {},
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
       "/src/core/index.ts",
       "/src/core/some_decl.d.ts"
@@ -244,24 +244,24 @@ exports.multiply = multiply;
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-13851440507",
@@ -286,8 +286,8 @@ exports.multiply = multiply;
     },
     "referencedMap": {
       "/src/logic/index.ts": [
-        "/src/core/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/core/anothermodule.d.ts",
+        "/src/core/index.d.ts"
       ]
     },
     "exportedModulesMap": {
@@ -297,12 +297,12 @@ exports.multiply = multiply;
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
-      "/src/core/index.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
+      "/src/core/index.ts",
       "/src/logic/index.ts"
     ]
   }
@@ -458,24 +458,24 @@ sourceFile:index.ts
   "program": {
     "fileInfos": {
       "/lib/lib.d.ts": {
-        "version": "38840781448",
-        "signature": "38840781448"
+        "version": "/lib/lib.d.ts",
+        "signature": "/lib/lib.d.ts"
       },
       "/lib/lib.es5.d.ts": {
-        "version": "-157947125741",
-        "signature": "-157947125741"
+        "version": "/lib/lib.es5.d.ts",
+        "signature": "/lib/lib.es5.d.ts"
       },
       "/lib/lib.dom.d.ts": {
-        "version": "-1086375748659",
-        "signature": "-1086375748659"
+        "version": "/lib/lib.dom.d.ts",
+        "signature": "/lib/lib.dom.d.ts"
       },
       "/lib/lib.webworker.importscripts.d.ts": {
-        "version": "16827914512",
-        "signature": "16827914512"
+        "version": "/lib/lib.webworker.importscripts.d.ts",
+        "signature": "/lib/lib.webworker.importscripts.d.ts"
       },
       "/lib/lib.scripthost.d.ts": {
-        "version": "-7856822451",
-        "signature": "-7856822451"
+        "version": "/lib/lib.scripthost.d.ts",
+        "signature": "/lib/lib.scripthost.d.ts"
       },
       "/src/core/index.ts": {
         "version": "-13851440507",
@@ -506,27 +506,27 @@ sourceFile:index.ts
         "/src/core/anothermodule.d.ts"
       ],
       "/src/tests/index.ts": [
+        "/src/core/anothermodule.d.ts",
         "/src/core/index.d.ts",
-        "/src/logic/index.d.ts",
-        "/src/core/anothermodule.d.ts"
+        "/src/logic/index.d.ts"
       ]
     },
     "exportedModulesMap": {
-      "/src/tests/index.ts": [
+      "/src/logic/index.ts": [
         "/src/core/anothermodule.d.ts"
       ],
-      "/src/logic/index.ts": [
+      "/src/tests/index.ts": [
         "/src/core/anothermodule.d.ts"
       ]
     },
     "semanticDiagnosticsPerFile": [
       "/lib/lib.d.ts",
-      "/lib/lib.es5.d.ts",
       "/lib/lib.dom.d.ts",
-      "/lib/lib.webworker.importscripts.d.ts",
+      "/lib/lib.es5.d.ts",
       "/lib/lib.scripthost.d.ts",
-      "/src/core/index.ts",
+      "/lib/lib.webworker.importscripts.d.ts",
       "/src/core/anothermodule.ts",
+      "/src/core/index.ts",
       "/src/logic/index.ts",
       "/src/tests/index.ts"
     ]